Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Feb 2015 12:34:19 +0000 (13:34 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Feb 2015 12:34:19 +0000 (13:34 +0100)
commit0123745ce26b561fbae32a565d48a123d372cad6
treee5bbab3a78ed76d7ed707dbe18a1e62fddbb4311
parent9d5eb7363193ec7cc259894aececd6c1a53b576d
parent88f4d873fc117aa8d2a26a4c0351e2a12ceb83dd
Merge branch '2013.10' into 2014.11
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/js/EventUI.js
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Import/Abstract.php