Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Sep 2016 08:07:39 +0000 (10:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Sep 2016 08:07:39 +0000 (10:07 +0200)
commit47bca21c302369dfe59e84842097eee0a3f84014
tree71307348c81bc4b5c1bfed9ff90e1051ccce0149
parentdcb02223cc85eb99e6281366014304812dbf5f96
parent47eb80cfb398d105cccaefe5e5b35a7fcedff03d
Merge branch '2015.11' into 2015.11-develop

Change-Id: Ieb9ce5a2baf2abbff76a6317ba77fbb2a5b7c9a6
tine20/composer.json
tine20/composer.lock