projects / tine20 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4f0fea 735980a)
Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Nov 2016 13:55:47 +0000 (14:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Nov 2016 13:55:47 +0000 (14:55 +0100)
1  2 
tine20/Calendar/Frontend/Json.php patch | diff1 | diff2 | blob | history
tine20/Tinebase/User.php patch | diff1 | diff2 | blob | history

diff --cc tine20/Calendar/Frontend/Json.php
Simple merge
diff --cc tine20/Tinebase/User.php
Simple merge
GroupWare & CRM