Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Jun 2015 18:27:26 +0000 (20:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Jun 2015 18:27:26 +0000 (20:27 +0200)
commitd7f4005bc56a9f617c0cd9174a6b6c08287c7963
tree0714168257f502ce8315e2a18907f9d9266bdcbf
parent20e2e67fede9851ecd31b206919fab7effe095bb
parent311dde3f5fe24e1c90748103cbb26cd23d4f9295
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Calendar/js/EventEditDialog.js

Change-Id: I514b952f39991dac92d91af7a8c0a8dfb0d60e89
tine20/Calendar/js/EventEditDialog.js
tine20/Tinebase/Frontend/Json.php