Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Apr 2017 09:15:38 +0000 (11:15 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Apr 2017 09:15:38 +0000 (11:15 +0200)
1  2 
tine20/Setup/Update/Abstract.php
tine20/Tinebase/Tags.php

Simple merge
Simple merge