diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:21:06 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:21:06 +0200 |
| commit | fff174199f67fd16d99928da6966b0a1d42ee960 (patch) | |
| tree | 1fc39b01d123ddd5beabeb9abb4814cd9bf0beba /templates_nb | |
| parent | e2ae264d5d6327ac1e45f422150d2dd518ac8f68 (diff) | |
| parent | cca56fb84cb317dcc2fe2427f2f661546fe2a83d (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
ikiwiki.setup
Diffstat (limited to 'templates_nb')
0 files changed, 0 insertions, 0 deletions