aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-11-26 17:07:14 -0600
committerAlex Gaynor <alex.gaynor@gmail.com>2014-11-26 17:07:14 -0600
commitfcea445e88b4435b9c093f01b4a6f90497974398 (patch)
treeadea8572f54e3a5258887cb2acb189172e44aed2
parented80d55b222f87dfb58e368f9211cc727951c746 (diff)
parentcebb31a9388305827e3b8aaa6bf1dab6a672cf6c (diff)
downloadcryptography-fcea445e88b4435b9c093f01b4a6f90497974398.tar.gz
cryptography-fcea445e88b4435b9c093f01b4a6f90497974398.tar.bz2
cryptography-fcea445e88b4435b9c093f01b4a6f90497974398.zip
Merge pull request #1497 from reaperhulk/update-supported-platforms
add Yosemite to our list of tested/supported platforms
-rw-r--r--docs/installation.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index d1b6e69d..d7645cac 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -15,7 +15,7 @@ on these operating systems.
* x86-64 CentOS 7.x, 6.4 and CentOS 5.x
* x86-64 FreeBSD 9.2 and FreeBSD 10
-* OS X 10.9 Mavericks, 10.8 Mountain Lion, and 10.7 Lion
+* OS X 10.10 Yosemite, 10.9 Mavericks, 10.8 Mountain Lion, and 10.7 Lion
* x86-64 Ubuntu 12.04 LTS
* 32-bit Python on 64-bit Windows Server 2008
* 64-bit Python on 64-bit Windows Server 2012