Merge pull request #18 from edx/django-update

Upgraded Django and South

Merge pull request #18 from edx/django-update
Upgraded Django and South
3b5d855b · Clinton Blackburn · 8f9fa0a0 · 597905ec · 3b5d855b
Commit 3b5d855b authored Aug 20, 2014 by Clinton Blackburn
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

requirements/base.txt
+2 -2

No files found.
--- a/requirements/base.txt
+++ b/requirements/base.txt
-Django==1.6.5 						# BSD License
+Django==1.6.6 						# BSD License
 Markdown==2.4.1 					# BSD
-South==0.8.1 						# APache License
+South==1.0   						# Apache License
 django-model-utils==1.4.0 			# BSD
 djangorestframework==2.3.5			# BSD
 ipython==2.1.0						# BSD