rallytime 281cbbe048 Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cloud/clouds/libvirt.py - salt/daemons/masterapi.py - salt/modules/file.py - salt/modules/yumpkg.py - salt/states/archive.py - salt/states/file.py - salt/utils/files.py - salt/utils/minions.py		2017-09-25 09:40:18 -04:00
..
all	Merge branch '2017.7' into 'develop'	2017-09-25 09:40:18 -04:00
index.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00