diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:37:00 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:37:00 +0200 |
| commit | 5045a055d80c8d1147e893dbf59fd9590fd21318 (patch) | |
| tree | e58445bfce86014ade93b334664612c445890dfe /templates | |
| parent | a512a752158af238812625c2c482f518ac7927a2 (diff) | |
| parent | cba18592fa1db4c492cb99b29dfa8e23edee0f84 (diff) | |
Merge branch 'nb' into _multilang
Conflicts (manually resolved):
ikiwiki_nb.setup
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions