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	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06:00
index.rst	Documentation spelling fixes (#35773)	2016-08-25 13:41:03 -06:00