diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
| commit | 00416c4072095e97f099116ccc31675e2a3c881b (patch) | |
| tree | 9cc54a88d5b57212b420625417f085d0706e4cbb /Makefile | |
| parent | 33557b73e518e0549e3dabc9a89a2c805c2a62f1 (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into multilang
Conflicts (manually resolved):
Makefile
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 # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki_da.setup ikiwiki_no.setup ikiwiki.setup +#CONFIGS = ikiwiki_da.setup ikiwiki_nb.setup ikiwiki.setup # Everything after this is generic |