Merge branch '2016.03' of https://gerrit.tine20.org/tine20/p/tine20 into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 12:29:37 +0000 (14:29 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 12:29:37 +0000 (14:29 +0200)
commitbf56003c9124a46f7d14034411b2a6f1ae771714
treeac7fc3ad59555f0548c71e022ee172a9a1bcad15
parent534cb6e0483ddd49d2ac6cc91067813c94797eea
parentecbe0884279bb648e7730bb32c311208e275af0c
Merge branch '2016.03' of https://gerrit.tine20.org/tine20/p/tine20 into 2016.03
tine20/composer.json