Permalink
Browse files

Merge branch 'master' of git://github.com/ubernostrum/kuma-lib

Conflicts:
	.gitmodules
	vendor.pth
  • Loading branch information...
2 parents 26b9a5f + bcce974 commit c6a3bc360a12d13ea8c8bc08f8ffb6d28cd0a582 @lmorchard lmorchard committed Dec 15, 2011
Showing with 5 additions and 0 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 src/soapbox
  3. +1 −0 vendor.pth
View
@@ -100,3 +100,6 @@
[submodule "src/django-browserid"]
path = src/django-browserid
url = git://github.com/mozilla/django-browserid.git
+[submodule "src/soapbox"]
+ path = src/soapbox
+ url = git://github.com/ubernostrum/django-soapbox.git
Submodule soapbox added at e6c488
View
@@ -1,3 +1,4 @@
src/smuggler
src/django-constance
src/django-browserid
+src/soapbox

0 comments on commit c6a3bc3

Please sign in to comment.