diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-25 21:35:52 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-25 21:35:52 +0200 |
| commit | d9b0030b0c792eb4d5c4fa8924d62033e7c0a9c9 (patch) | |
| tree | 9d8d97a7d7c16711ee41181cc927b4ba7e3a0af9 | |
| parent | 19527ccc67bf7f7554017cbbe856cbcca929f730 (diff) | |
| parent | 8373fc460a61f38f0b3104ea1e6d38f7daacc60e (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_nb.setup
| -rw-r--r-- | ikiwiki_nb.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index cd05a41..e9477d8 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -63,7 +63,7 @@ use IkiWiki::Setup::Standard { # strftime format string to display date timeformat => '%c', # UTF-8 locale to use - locale => 'no_NB.UTF-8', + locale => 'nb_NO.UTF-8', # put user pages below specified page userdir => '', # how many backlinks to show before hiding excess (0 to show all) |