diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:58:50 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:58:50 +0200 |
| commit | 892a8c8634eb48e08462cf6329fa38fd782141ca (patch) | |
| tree | e9e169abfebecf165dc22cbc0a50e252e49cda70 /po | |
| parent | b3fd712357c135e288fc1b71957e54aca995c2cc (diff) | |
| parent | f1b34caf087ee01d9de744bee5fbde7d296fd63f (diff) | |
Merge branch 'nonedit' into allinone-da
Conflicts (manually resolved):
ikiwiki_admin.setup
ikiwiki_da_admin.setup
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions