Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Mar 2016 14:52:39 +0000 (15:52 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Mar 2016 14:52:39 +0000 (15:52 +0100)
commitef5236aba4815a387a630c56a11842f38a13fdc8
tree0dca0ee792f4c8ab0f8bf78d032d012ddc144c94
parentcb9ce967890c8d70edb02c3aa3353e80cf8a554a
parentaae52a40b632ab0729e8721fb4d55f2f1056653a
Merge branch '2015.11' into 2015.11-develop
tine20/Tinebase/js/common.js
tine20/Tinebase/translations/de.po