Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 14:09:05 +0000 (16:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 14:09:05 +0000 (16:09 +0200)
commitf91e0901344bf631028d73203f75083f55aafeac
tree0b96eb1a6c4c1391b682ecd78b17cfc8b8c07106
parent9f0090d2cd90b186b99c058c66523afdcaa14b57
parentee535a20e15328da6d8dc3fa3efead3ac810e0bb
Merge branch '2015.11-develop' into 2016.03

Conflicts:
tine20/Tinebase/Config.php
tine20/library/Zend/Locale/Format.php

Change-Id: I504a52e41632f81ddd76668885dc2c2161a1feda
tests/tine20/Addressbook/JsonTest.php
tine20/Tinebase/Config.php
tine20/composer.json
tine20/composer.lock