Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:35:27 +0000 (10:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:35:27 +0000 (10:35 +0200)
commitcb26c7c973c17de892d32bcca72dbb90c7642421
tree37d0b442cff0539de7f073260aeac6fe0b3814ca
parentfa9629aaffd9e408c52b37f20fe854817e48ea3f
parent6fafe8a41c3a22963711e9a765c8778bbf923f23
Merge branch '2015.11-develop' into 2016.03
tine20/Admin/Frontend/Json.php
tine20/Setup/Controller.php