projects / kivitendo-erp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a8e04a d5d5779)
Merge branch 'template_locales'
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 12 Jul 2010 14:13:05 +0000 (16:13 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 12 Jul 2010 14:13:05 +0000 (16:13 +0200)
commit2d3f862b7af94f31860dd264eef7c1bc7de7eae2
tree5703f2bd14f90c5b6d87e183c8341ecd2cac958ftree | snapshot
parent9a8e04a307fedab0a95760342e93200fbfe3acb9commit | diff
parentd5d5779f5bc70ed1b224ff57a147a5db25767d88commit | diff
Merge branch 'template_locales'

Conflicts:
templates/webpages/admin/edit_user_master.html
templates/webpages/admin/list_users_de.html
templates/webpages/is/form_header_master.html
locale/de/all diff1 | diff2 | blob | history
locale/de/ap diff1 | diff2 | blob | history
locale/de/ar diff1 | diff2 | blob | history
locale/de/ir diff1 | diff2 | blob | history
locale/de/is diff1 | diff2 | blob | history
templates/webpages/admin/edit_user.html | diff2 | blob | history
templates/webpages/is/form_header.html | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.