salt/doc/topics/development/conventions
Colton Myers d1b201e2bf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/runners/manage.py
	salt/utils/cloud.py
2015-01-15 16:20:48 -07:00
..
documentation.rst Comma cleanup 2014-12-12 11:39:40 -08:00
formulas.rst Merge branch '2014.7' into develop 2014-12-23 10:57:26 -07:00
index.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
packaging.rst Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-15 16:20:48 -07:00
release.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
style.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00