Pedro Algarvio c33b56281b Merge 3006.x into master ... Conflicts: * doc/ref/configuration/minion.rst		2023-04-28 10:20:04 +01:00
..
static	Merge 3006.x into master	2023-04-28 10:20:04 +01:00
base.txt	Use packaging for version parsing. looseversion when needed only.	2023-01-09 12:31:51 -07:00
build.txt	Create source tarball and install it on relenv onedir	2023-01-25 10:05:16 -07:00
crypto.txt	update pycryptodome	2020-10-02 16:03:48 -06:00
darwin.txt	Remove mako from Windows and MacOS	2023-04-04 08:33:30 +01:00
pytest.txt	Revert "Bump to pytest-salt-factories==1.0.0rc23 on Python >= 3.7"	2022-12-17 14:30:12 +00:00
windows.txt	Remove mako from Windows and MacOS	2023-04-04 08:33:30 +01:00
zeromq.txt	Merge remote-tracking branch 'upstream/3006.x' into merge-forward/3006.x/master	2023-04-20 17:39:55 -05:00