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)
commit5c27b5fcc155f274bb1a1a832e9f4c2cc3ee324a
treeef55f087c415c98c4cbfb43bf8b8eb422070b702
parent4fb178e9d1842d3b8e6b7a12bb073646533e2cc2
parentce7e01a00834a272de2930cb91b118e5238dd03e
Merge branch '2015.11' into 2015.11-develop
tine20/Setup/js/init.js
tine20/Tinebase/js/tineInit.js