Merge branch 'master' of https://github.com/APSL/django-rest-framewor…

…k-csv into APSL-master Conflicts: rest_framework_csv/renderers.py
mjumbewu · Jan 14, 2014 · ec8ac98 · ec8ac98
2 parents 8c1c431 + 61bae25
commit ec8ac98
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 Django>=1.3
 djangorestframework
-six
+six>=1.4.1