diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 17:23:13 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 17:23:13 +0200 |
| commit | 866905908c179b30553aa448dc04f2092bdd951c (patch) | |
| tree | 935c01d73238245c8db40cc1f0114f2d00185918 /.gitmodules | |
| parent | c4a53e9b62f5f912038b8148e010d37b44a0a3ad (diff) | |
| parent | 0195f9d307c7c184f3e056a816124d24ae272531 (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved: merge old and new parts):
.gitmodules
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index eec5fb2..2045436 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,12 @@ [submodule "smiley_nb"] path = smiley_nb url = git://source.jones.dk/ikiwiki/smiley +[submodule "javascript"] + path = javascript + url = git://source.jones.dk/ikiwiki/javascript +[submodule "openid-selector"] + path = openid-selector + url = git://source.jones.dk/ikiwiki/openid-selector +[submodule "themes"] + path = themes + url = git://source.jones.dk/ikiwiki/themes |