summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-09 01:27:31 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-09 01:27:31 +0200
commitcf73eeb407dc71c8747913eed9dbf77b80fe07ab (patch)
tree9457a502d3287435dcb1dd3b04dfa365c0c74b42 /Makefile
parent5daea1607d15a4cc952ec36204a895836bb2d73f (diff)
parent12b77d467ad60c649d706f01b73eb600c4375a30 (diff)
Merge branch 'master' into scs
Conflicts (manually resolved): Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index de0c770..f263303 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
ikiwiki_MODULES = templates basewiki smiley
ikiwiki_POMODULES = basewiki smiley
ikiwiki_BRANCH = scs-LOCALE
-ikiwiki_LOCALES = da no_NB
+ikiwiki_LOCALES = da nb
ikiwiki_POLOCALES = da
#dummy_MODULES = content_dummy