rallytime 40cd0ac8fe Merge branch '2016.3' into 'develop' ... Conflicts: - salt/states/file.py - tests/runtests.py		2016-02-25 16:21:15 -07:00
..
index.rst	Merge branch '2015.8' into '2016.3'	2016-02-20 12:27:41 -07:00
writing.rst	[saltstack/salt#31194] Add documentation about running multiple salt-api modules, advised by @whiteinge.	2016-02-22 11:35:16 +09:00