Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
maxwell 2010-11-08 10:00:54 -08:00
commit 5b2f800e6c
2 changed files with 4 additions and 0 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "pkg"]
path = pkg
url = git@github.com:diaspora/diaspora-packages.git

1
pkg Submodule

@ -0,0 +1 @@
Subproject commit 3bb1e77a05979a2af130515eea9ea7fceacaed2a