diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:51:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:51:10 +0200 |
| commit | b0e3717da09c28fe33bd86a00df83039eed705d2 (patch) | |
| tree | 957be5e148d7feb3b4b39b7713ffdfe62c1e965e /Makefile | |
| parent | b01432549c31b47de2b4cd907585477df5fc4dbd (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
Makefile
smiley
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,7 +12,7 @@ ikiwiki_LOCALES = da nb dummy_MODULES = content_dummy content_dummy_da content_dummy_nb # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki_admin.setup ikiwiki_da_admin.setup ikiwiki_nb_admin.setup ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup +#CONFIGS = ikiwiki_da_admin.setup ikiwiki_nb_admin.setup ikiwiki_admin.setup ikiwiki_da.setup ikiwiki_nb.setup ikiwiki.setup # Everything after this is generic |