rallytime 6464236f68 Merge branch '2016.3' into 'develop' ... Conflicts: - doc/conf.py - doc/ref/returners/index.rst - salt/states/disk.py		2016-08-25 16:09:01 -06:00
..
all	added docs	2016-07-28 11:33:42 +10:00
index.rst	Merge branch '2016.3' into 'develop'	2016-08-25 16:09:01 -06:00