Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Sep 2016 08:14:39 +0000 (10:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Sep 2016 08:14:39 +0000 (10:14 +0200)
1  2 
tine20/Setup/js/init.js
tine20/Tinebase/js/tineInit.js

Simple merge
Simple merge