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)
commit2fb4c518eae2d3568a505c8d28a1a27afc8d44c2
tree496187067dc547118aa6591e6ec9ab25ae171a8a
parent957ddea4247897ee12d14597ce5390886a8e7fd6
parent2a4c2b3ac8b843d5298643c0b8d0d1d1b0af5f63
Merge branch '2015.11-develop' into 2016.03
tine20/Calendar/js/Calendar.js
tine20/Tinebase/Config.php
tine20/Tinebase/js/tineInit.js
tine20/build.xml