diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 00:10:46 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 00:10:46 +0200 |
| commit | 3d4b293b8946c83ad5407468ed70c33de0dbac41 (patch) | |
| tree | 06a272f777d882601ce2c7288b96aa0722ab8e71 /Makefile | |
| parent | 6aa529351a5846e0ca643e347264950a0f5f6795 (diff) | |
| parent | eef5d621955a05ee72f63c83732900928f6be90d (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved):
Makefile (preserved non-locale settings)
ikiwiki_da.setup
ikiwiki_da_admin.setup
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions