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)
commit636fe7c1c9d6ed651b57643702c0daf02920feed
tree78e47b69a8d753aa17f900a57d47a21ee50765ea
parenta18a38a7feb13f93b0fe13e8a024db1db184465c
parent73e9ffe887549aa897e8d992607eb936c40ceecf
Merge branch '2017.11' into 2017.11-develop
tine20/Tinebase/Export/Abstract.php
tine20/Tinebase/Setup/Update/Release10.php