Merge branch 'pu/2013.10-mailto' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Feb 2015 12:43:52 +0000 (13:43 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Feb 2015 12:43:52 +0000 (13:43 +0100)
commit7cf31843620fa14f25e63d284d7d9e40f64ff81e
tree83810359cba483f05c250d64f00797406414e3b0
parent21e0ec90a3beb1471a23cf02ed40c4fe73657de4
parent671fd82f15e3db6aa270a96fad403663beb8245e
Merge branch 'pu/2013.10-mailto' into 2014.11-develop

Conflicts:
tine20/Tinebase/js/MainMenu.js

Change-Id: Iff5447f347286824e7b8bcc824b9a084ea606ebe
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/js/Application.js
tine20/Tinebase/js/ExceptionHandler.js
tine20/Tinebase/js/MainMenu.js
tine20/Tinebase/js/common.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js