Merge branch 'master' of https://gerrit.tine20.org/tine20/p/tine20
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:53:16 +0000 (20:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:53:16 +0000 (20:53 +0200)
commit6b999b1587254d17520ca13f563351db88b76c0f
tree699f63ad3eb12db96a625f89ddd3b34914348704
parenta7c5505e78fc5ce0ddc58387e28a6896364d3a6a
parent7cc3ca7882287e9d92d55e5ac27d19318d634428
Merge branch 'master' of https://gerrit.tine20.org/tine20/p/tine20

Conflicts:
tine20/Tinebase/Controller.php

Change-Id: Ie864176f73a3f33865d34813e3b8ca9b5a427689
tine20/Tinebase/Controller.php
tine20/Tinebase/Frontend/Json.php