salt/doc/topics/development/conventions
Colton Myers 8d86bc3056 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/states/rabbitmq_user.py
    salt/states/user.py
2015-11-23 09:53:11 -07:00
..
documentation.rst A couple of spelling fixes for doc conventions page. 2015-11-15 14:49:47 -07:00
formulas.rst Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-10-30 16:05:26 -06: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 Add section to style guide 2015-11-20 09:23:39 -07:00