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)
1  2 
tine20/Admin/Frontend/Json.php
tine20/Setup/Controller.php

Simple merge
Simple merge