projects / tine20 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa6e645 097a572)
Merge branch '2015.11-develop' into 2016.03 2016.03.4
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jun 2016 11:47:35 +0000 (13:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jun 2016 11:47:35 +0000 (13:47 +0200)
1  2 
tine20/Tinebase/js/tineInit.js patch | diff1 | diff2 | blob | history

diff --cc tine20/Tinebase/js/tineInit.js
Simple merge
GroupWare & CRM