aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-01-18 14:04:59 +0000
committerTom Christie2013-01-18 14:04:59 +0000
commit0edf3042b82b7b0830b9a490f6b173bdd6386d06 (patch)
tree286548a8419907ee94f7793e785cca140fad502e
parent80a8d0f2793835f1a33be309ae3e51d4b7dbae39 (diff)
parentc07cdbdaca16e226c2e042443994a7579964faf3 (diff)
downloaddjango-rest-framework-0edf3042b82b7b0830b9a490f6b173bdd6386d06.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
-rw-r--r--README.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/README.md b/README.md
index a7020166..d7cc1c6d 100644
--- a/README.md
+++ b/README.md
@@ -295,4 +295,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[markdown]: http://pypi.python.org/pypi/Markdown/
[pyyaml]: http://pypi.python.org/pypi/PyYAML
[django-filter]: http://pypi.python.org/pypi/django-filter
-