Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 12:28:06 +0000 (14:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 12:28:06 +0000 (14:28 +0200)
commit534cb6e0483ddd49d2ac6cc91067813c94797eea
tree889d3f5ad8e00d0fb6ac96445df3af039ec21b35
parent6f8e34fa1c0796d9d3ef82fb4856b912aa7acb50
parent544ac668f50cd1e2c13c7c26dc5f2418de55d109
Merge branch '2015.11-develop' into 2016.03

Change-Id: Ie5db73be764d2267dc3939725e73dca42e874651
tine20/Expressomail/Setup/Initialize.php
tine20/Setup/Controller.php
tine20/Tinebase/Config.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/js/LoginPanel.js
tine20/Tinebase/js/tineInit.js
tine20/composer.json