Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/mozilla/mozillians-lib

  • Loading branch information...
commit a5fdf941bc8d4c99ab9939496b5d51fb5ce486bd 2 parents 7a8e4f9 + ac36138
@davedash davedash authored
Showing with 5 additions and 4 deletions.
  1. +3 −3 .gitmodules
  2. +1 −1  src/django-browserid
  3. +1 −0  vendor.pth
View
6 .gitmodules
@@ -1,9 +1,6 @@
[submodule "src/django"]
path = src/django
url = git://github.com/django/django
-[submodule "src/django-browserid"]
- path = src/django-browserid
- url = git://github.com/mozilla/django-browserid.git
[submodule "src/django-sha2"]
path = src/django-sha2
url = git://github.com/fwenzel/django-sha2.git
@@ -67,3 +64,6 @@
[submodule "src/pyes"]
path = src/pyes
url = git://github.com/aparo/pyes.git
+[submodule "src/django-browserid"]
+ path = src/django-browserid
+ url = git://github.com/tallowen/django-browserid.git
2  src/django-browserid
@@ -1 +1 @@
-Subproject commit aee3c0209ebd21fb3b03242c5f349f41c1562161
+Subproject commit ca18861250075e995d8bfa909032f202d49f61de
View
1  vendor.pth
@@ -21,3 +21,4 @@ src/test-utils
src/tower
src/elasticutils
src/pyes
+src/django-browserid
Please sign in to comment.
Something went wrong with that request. Please try again.