diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 16:01:21 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 16:01:21 +0200 |
| commit | 1a51b9ae5cb6065e7cbda59489d72b51e661609c (patch) | |
| tree | 9edf560e5006f2dde118633581fdd624450447a4 | |
| parent | edd938f58f422dec0443a35daf8d4052d28851c0 (diff) | |
| parent | a1aaa3a8fe5724019537460a3064211a86f7fbf5 (diff) | |
Merge branch 'nonedit' into allinone-nb
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | basewiki_nonedit | 0 | ||||
| m--------- | templates_nonedit | 0 |
4 files changed, 6 insertions, 2 deletions
@@ -1,10 +1,8 @@ /basewiki_l10n -/basewiki_nonedit /basewiki_nonedit_l10n /content /content_dummy /directives_l10n /smiley_l10n /templates_l10n -/templates_nonedit /templates_nonedit_l10n diff --git a/.gitmodules b/.gitmodules index 4c34cde..3d4256b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [submodule "templates"] path = templates url = git://source.jones.dk/ikiwiki/templates +[submodule "basewiki_nonedit"] + path = basewiki_nonedit + url = git://source.jones.dk/ikiwiki/basewiki +[submodule "templates_nonedit"] + path = templates_nonedit + url = git://source.jones.dk/ikiwiki/templates diff --git a/basewiki_nonedit b/basewiki_nonedit new file mode 160000 +Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea diff --git a/templates_nonedit b/templates_nonedit new file mode 160000 +Subproject 8c0c142ad073666eaa626ea6bebcc76138e351f |