salt/doc/topics/development/conventions
rallytime 494a06bee2 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-12-20 10:03:44 -07:00
..
documentation.rst Change all relevant Boron references to 2016.3.0 2016-02-10 15:45:28 -07:00
formulas.rst Fix typo 2016-09-20 21:07:33 -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 Update the release process docs 2016-05-13 14:28:57 -06:00
style.rst Merge branch '2016.3' into '2016.11' 2016-12-19 14:58:39 -07:00