Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Jan 2015 13:09:58 +0000 (14:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Jan 2015 13:09:58 +0000 (14:09 +0100)
commit85ae1d1ee7f6984dfa2920f863cf56042af694ae
tree3de9a825c2f2d2693402c5f2ff75a51f0bec1576
parent86980f50304b6d1d3f2e0df9360edbbcacdc5c56
parent4e9017932c2a383c2989d929c8513c6e0ec012d9
Merge branch '2013.10' into 2014.11
tine20/Calendar/css/print.css
tine20/Calendar/js/EventUI.js
tine20/Courses/Controller/Course.php
tine20/Tinebase/Model/FullUser.php
tine20/Tinebase/User/Abstract.php