diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 01:47:00 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 01:47:00 +0200 |
| commit | 354a21164830b6c2db1a2c68103cc18bf80863c6 (patch) | |
| tree | 9eb31ea7e9a00e9a7ae7332b4fb4c7e6afac5438 /Makefile | |
| parent | 0d30afbdd017898f5d073cd6541d487906ce04d2 (diff) | |
| parent | 07bfb10a4979f79bef7d57def3e8212fedc378d4 (diff) | |
Merge branch 'wian' into allinone
Conflicts (manually resolved):
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,8 +3,8 @@ SOURCES = ikiwiki ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE ikiwiki_MODULES = templates basewiki smiley ikiwiki_POMODULES = basewiki smiley -ikiwiki_BRANCH = allinone-LOCALE ikiwiki_LOCALES = da no_NB +ikiwiki_LOCALES = da nb ikiwiki_POLOCALES = da #dummy_MODULES = content_dummy |