rallytime 9d049e28e5 Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/win_pkg.py - salt/states/disk.py		2016-06-15 17:13:26 -06:00
..
arch.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-02-23 14:25:51 -07:00
debian.rst	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00
fedora.rst	Minor doc bug fixes	2015-08-19 11:31:26 -06:00
freebsd.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
gentoo.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Merge pull request #34025 from rallytime/merge-2016.3	2016-06-15 15:41:00 -04:00
openbsd.rst	Add OpenBSD installation documentation to 2015.5 branch	2015-10-20 09:13:28 -06:00
osx.rst	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00
rhel.rst	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00
solaris.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
suse.rst	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06:00
ubuntu.rst	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00
windows.rst	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00