diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-01 19:33:43 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-01 19:33:43 +0200 |
| commit | f55be32f0eab27608de940c77162f7644d0b001f (patch) | |
| tree | e116b4b1c7c4526a1fd0a60b8264ea43c484fe80 /ikiwiki.setup | |
| parent | cdd1e10ec8dae9429ca922cc512f48eb9adab783 (diff) | |
| parent | 46cf7b058a4d2c14cdb7e411ecbd3ca4da9b1284 (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_da_admin.setup
Diffstat (limited to 'ikiwiki.setup')
0 files changed, 0 insertions, 0 deletions