summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2014-07-29 11:58:00 -0400
committerMicah Anderson <micah@riseup.net>2014-07-29 11:58:00 -0400
commit59120d5c3371f6b6af762c074f3dcf6bc9597a63 (patch)
tree44af2ef57e8ab54655676a329afc579f9cb89a81
parent5dfe42eff24171f89fc282ee60a8b9efa0069741 (diff)
parent03cddf25a41e34383537522d60d1a8b11d66d776 (diff)
Merge remote-tracking branch 'ivan/update-supported-os'
Conflicts: docs/client/en.md
-rw-r--r--docs/client/en.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/client/en.md b/docs/client/en.md
index 8fc17a8..1eae442 100644
--- a/docs/client/en.md
+++ b/docs/client/en.md
@@ -47,8 +47,8 @@ We currently support:
* Debian 7
* Ubuntu 12.04 (LTS)
-* Ubuntu 13.10 (latest)
-* Mac OSX >= 10.8
+* Ubuntu 14.04 (LTS, latest)
+* Mac OSX >= 10.8 (coming very soon)
* Note: It *should* work in other Debian based distros
### Through the debian package