Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:40:03 +0000 (13:40 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:40:03 +0000 (13:40 +0100)
commitf4831f54a5e4eb255e48cc717503654fde166f93
treee84836874b627ab1948a36b78d30cd6f508e606b
parent534bf56397b120bf5506047bae2da8c3efe806ec
parentbf06b63b828137baf21b2f6d591d00678514048f
Merge branch '2014.11' into 2014.11-develop
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Calendar/Controller/EventNotifications.php
tine20/Tinebase/User.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js