Merge branch '2017.11' into 2017.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 11 Aug 2017 15:41:11 +0000 (17:41 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 11 Aug 2017 15:41:11 +0000 (17:41 +0200)
1  2 
tine20/Tinebase/Export/Abstract.php
tine20/Tinebase/Setup/Update/Release10.php

Simple merge