Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:54 +0000 (10:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:54 +0000 (10:53 +0200)
1  2 
tine20/Calendar/js/Calendar.js
tine20/Tinebase/Config.php
tine20/Tinebase/js/tineInit.js
tine20/build.xml

Simple merge
Simple merge
Simple merge
Simple merge