projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8f5fe5 620fd32)
Merge branch 'master' into dev
authorThomas Heck <theck@linet-services.de>
Mon, 4 Mar 2013 08:51:27 +0000 (09:51 +0100)
committerThomas Heck <theck@linet-services.de>
Mon, 4 Mar 2013 08:51:27 +0000 (09:51 +0100)
1  2 
SL/Layout/None.pm patch | diff1 | diff2 | blob | history
scripts/locales.pl patch | diff1 | diff2 | blob | history

diff --cc SL/Layout/None.pm
Simple merge
diff --cc scripts/locales.pl
Simple merge
Unnamed repository; edit this file 'description' to name the repository.