Merge pull request #905 from akatsoulas/django-1.4.18

Change version to django 1.4.18.
mozilla · Jan 15, 2015 · acbdc71 · acbdc71
2 parents 71e2d0c + b66ffe1
commit acbdc71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -37,3 +37,6 @@
 [submodule "vendor-local/src/django-browserid"]
 	path = vendor-local/src/django-browserid
 	url = git://github.com/mozilla/django-browserid.git
+[submodule "vendor-local/src/django"]
+	path = vendor-local/src/django
+	url = git://github.com/django/django.git
diff --git a/vendor-local/src/django b/vendor-local/src/django
diff --git a/vendor-local/vendor.pth b/vendor-local/vendor.pth
@@ -9,4 +9,5 @@ src/pystatsd
 src/django-statsd
 src/django-tastypie
 src/django-database-email-backend
-src/django-browserid
+src/django-browserid
+src/django