]> wagnertech.de Git - mfinanz.git/commitdiff
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)
Conflicts:
templates/webpages/admin/edit_user_master.html
templates/webpages/admin/list_users_de.html
templates/webpages/is/form_header_master.html


No differences found