Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Oct 2015 15:44:47 +0000 (16:44 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Oct 2015 15:44:47 +0000 (16:44 +0100)
commit7410265ab803447b299ff3a7d7c5e36fcf0fb52b
tree06d90f5dacb71345768248d694e2589758a8788d
parenta3dc5ae6bb754cbca00b7d43cbef35a49019c2ab
parent126796cc70b37b25060a35b09e2b7c31440085a1
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/Relations.php

Change-Id: I0bb38a15f644459b0b56953a090af6c1adc4f1ba
tine20/Setup/Controller.php
tine20/Tinebase/Relation/Backend/Sql.php
tine20/Tinebase/Relations.php
tine20/Tinebase/Timemachine/ModificationLog.php