Skip to content

Commit 4f32e04

Browse files
chore(release): 5.0.20 [skip ci]
## [5.0.20](v5.0.19...v5.0.20) (2025-06-09) ### Tests * **pre-commit:** check for Git merge conflict markers ([895d4f9](895d4f9))
1 parent 6e5451c commit 4f32e04

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

AUTHORS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord
55
Avatar|Contributor|Contributions
66
:-:|---|:-:
77
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|403
8-
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|122
8+
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|126
99
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|45
1010
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|27
1111
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|18
@@ -34,4 +34,4 @@ Avatar|Contributor|Contributions
3434

3535
---
3636

37-
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2025-06-06.
37+
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2025-06-09.

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [5.0.20](https://github.com/saltstack-formulas/template-formula/compare/v5.0.19...v5.0.20) (2025-06-09)
4+
5+
6+
### Tests
7+
8+
* **pre-commit:** check for Git merge conflict markers ([895d4f9](https://github.com/saltstack-formulas/template-formula/commit/895d4f90ebd851c74b1dd0b121f3a7f9d8618771))
9+
310
## [5.0.19](https://github.com/saltstack-formulas/template-formula/compare/v5.0.18...v5.0.19) (2025-06-06)
411

512

FORMULA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: TEMPLATE
22
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Oracle, SUSE, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
33
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
4-
version: 5.0.19
4+
version: 5.0.20
55
release: 1
66
minimum_version: 2019.2
77
summary: TEMPLATE formula

docs/AUTHORS.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
1818
- 403
1919
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
2020
- `@dafyddj <https://github.com/dafyddj>`_
21-
- 122
21+
- 126
2222
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>`
2323
- `@baby-gnu <https://github.com/baby-gnu>`_
2424
- 45
@@ -98,4 +98,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
9898

9999
----
100100

101-
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2025-06-06.
101+
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2025-06-09.

docs/CHANGELOG.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
Changelog
33
=========
44

5+
`5.0.20 <https://github.com/saltstack-formulas/template-formula/compare/v5.0.19...v5.0.20>`_ (2025-06-09)
6+
-------------------------------------------------------------------------------------------------------------
7+
8+
Tests
9+
^^^^^
10+
11+
12+
* **pre-commit:** check for Git merge conflict markers (\ `895d4f9 <https://github.com/saltstack-formulas/template-formula/commit/895d4f90ebd851c74b1dd0b121f3a7f9d8618771>`_\ )
13+
514
`5.0.19 <https://github.com/saltstack-formulas/template-formula/compare/v5.0.18...v5.0.19>`_ (2025-06-06)
615
-------------------------------------------------------------------------------------------------------------
716

0 commit comments

Comments
 (0)