diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:03:03 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:03:03 +0200 |
| commit | 67acb77d38849b83b4520e824acd06d1fcdf3c52 (patch) | |
| tree | 5d7dc10af510fbbaae470dd1722da41fe3c06b94 /editcreationconflict.tmpl | |
| parent | d8840de84a43bcb272e7ff694e02f9febec86a30 (diff) | |
| parent | 03cdb15da3f28c109a1a176d6c3f53cf5e1a18f3 (diff) | |
Merge branch 'master' into master-da + translate
Conflicts (replaced with updated PO-based translation):
renamesummary.tmpl
Diffstat (limited to 'editcreationconflict.tmpl')
0 files changed, 0 insertions, 0 deletions