rallytime add5b118a3 Merge branch '2017.7' into 'develop' ... Conflicts: - salt/modules/yumpkg.py - tests/unit/templates/test_jinja.py		2017-06-19 14:12:36 -06:00
..
all	Merge branch '2017.7' into 'develop'	2017-06-19 14:12:36 -06:00
index.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00