aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Brown2015-04-14 16:52:40 -0400
committerKevin Brown2015-04-14 16:52:40 -0400
commitec5c3aa5e779d0305b73fa8c9295abd160d36320 (patch)
tree87a88099c7eb8fca014c3f23e509b248e3b97a5c
parent970bfe16ecb888ac16fca08591e8d0ff5f1e9e7e (diff)
parent3abbeadfaf9f5bd338bb216583f1f8c2f9242e77 (diff)
downloaddjango-rest-framework-master.tar.bz2
Merge pull request #2823 from jpadilla/masterHEADmaster
Django 1.8 is no longer in beta
-rw-r--r--README.md2
-rw-r--r--docs/index.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 5044ee0f..64e1927d 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ There is a live example API for testing purposes, [available here][sandbox].
# Requirements
* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
+* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7+, 1.8)
# Installation
diff --git a/docs/index.md b/docs/index.md
index 13f4d0c4..a8da1946 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -50,7 +50,7 @@ Some reasons you might want to use REST framework:
REST framework requires the following:
* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
+* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7+, 1.8)
The following packages are optional: