rallytime 0ad101d560 Merge branch '2017.7' into 'oxygen' ... Conflicts: - doc/man/salt.7 - salt/modules/git.py - salt/modules/pacman.py - salt/states/git.py - tests/integration/modules/test_mac_user.py - tests/support/parser/__init__.py		2018-01-26 17:27:03 -05:00
..
raet	doc: fix RAET links	2015-09-25 12:16:47 -06:00
index.rst	Various spelling fixes	2016-07-16 13:17:09 -06:00
tcp.rst	Merge branch '2017.7' into 'oxygen'	2018-01-26 17:27:03 -05:00
zeromq.rst	Fix typo an recieved -> received	2015-11-04 10:59:22 +01:00