diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 01:09:20 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 01:09:20 +0200 |
| commit | a53189cdff1dcb63ba54fe9daec2242963d68ac9 (patch) | |
| tree | cfdfeae79b0230d34b12bd20e4609f7c9f25c187 | |
| parent | 44690eb345ff5b7396166e625a2c7285b72d584e (diff) | |
| parent | 12b77d467ad60c649d706f01b73eb600c4375a30 (diff) | |
Merge branch 'master' into clean
Conflicts (manually resolved):
Makefile
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4,7 +4,7 @@ ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE ikiwiki_MODULES = templates basewiki smiley ikiwiki_POMODULES = basewiki smiley ikiwiki_BRANCH = clean-LOCALE -ikiwiki_LOCALES = da no_NB +ikiwiki_LOCALES = da nb ikiwiki_POLOCALES = da #dummy_MODULES = content_dummy |