10 Commits

Author	SHA1	Message	Date
Colton Myers	945e6506b6	Merge branch '2014.7' into develop	2014-10-27 15:32:25 -06:00
Erik Johnson	142bac1522	Update release candidate number in docs sidebar	2014-10-25 17:56:28 -05:00
Colton Myers	71f422fd4d	Merge branch '2014.7' into develop	2014-10-07 15:10:40 -06:00
Colton Myers	e1d2d7cb6b	Update to rc3 in docs sidebar	2014-10-07 15:08:21 -06:00
Colton Myers	8d0bf0ee95	Merge branch '2014.7' into develop ... Conflicts: salt/states/pip_state.py	2014-09-15 11:49:04 -06:00
Colton Myers	f502159157	Update sidebar with newest release candidate	2014-09-15 11:45:47 -06:00
Alain Vandendorpe	c568cbaeb4	Fixed "other versions" link ... The link to previous docs releases was a redirect to the latest index page. Fixed. I would argue the de facto docs version should be "latest stable", but this is an in-place fix for the status quo.	2014-08-13 12:52:23 -07:00
Colton Myers	788ed4606f	Reword some things	2014-08-12 15:08:02 -06:00
Colton Myers	51917ee017	Add installation docs for Salt release candidate	2014-08-12 14:53:21 -06:00
Seth House	c3d4816275	Moved Salt version infos to its own sidebar template	2014-04-29 17:57:27 -06:00