summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 19:28:12 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 19:28:12 +0200
commit732fe48592a0f89c572c19f87314f43f6502bcb7 (patch)
tree6a4b5ea91398b10113166b5216b80488618ed68c
parentddc04a894c5aab7189aa785a172dece9d7d57bdf (diff)
parente398cb62d68b5c3bc943343f5226f28153480958 (diff)
Merge branch 'da' into _multilang
-rw-r--r--Makefile2
m---------basewiki0
m---------javascript0
m---------openid-selector0
m---------smiley0
m---------templates0
6 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8278047..1ee0175 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ ikiwiki_VERSION = 3.20100704
# modules (subproject extension names) used. Expands SOURCES
ikiwiki_MODULES = templates basewiki smiley directives
# locales used. Expands SOURCES
-#ikiwiki_LOCALES = da nb
+ikiwiki_LOCALES = da
# gettext-based modules and locales used
#ikiwiki_POMODULES = basewiki smiley directives
#ikiwiki_POLOCALES = da
diff --git a/basewiki b/basewiki
-Subproject 6b53960c5bbcf6a43f2e48b0b37a94e1f909b52
+Subproject 320795e6d83f5d9fa2fefdcdd3f28cf1033243b
diff --git a/javascript b/javascript
-Subproject dea1eff3d9e9781e5b92a326ad7df17d3ba8ba1
+Subproject 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0
diff --git a/openid-selector b/openid-selector
-Subproject b4852ae1f1905a285d69947d6352b6898303324
+Subproject 517a71e93b14812d722f000ab42a6e61cb7b402
diff --git a/smiley b/smiley
-Subproject 30dd469765c2396ded03355876af391e922e89b
+Subproject 0f24195c7ac3858346dff976970b8b21e911242
diff --git a/templates b/templates
-Subproject 5df058b2b3dc6e565ad3b3604263f487ef65f2a
+Subproject ee62a82c4be0125da6b4758e43e231a3c28c857