Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Jun 2016 09:14:42 +0000 (11:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Jun 2016 09:14:42 +0000 (11:14 +0200)
commiteaba528cf686fff2e761d42486ae1093bc22e5a0
tree9d48f276b81f6d1f6108986f8808282b43ef8422
parent7e7d81218b953ff6ee13b6b51478f9c99606325a
parente01a104673aaebd80dbe08b2c7c4812fc4354940
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tine20/Felamimail/js/MessageEditDialog.js
tine20/Tinebase/js/MainMenu.js
tine20/Tinebase/js/widgets/grid/FilterToolbar.js

Change-Id: I97ba4a6a9aab47e3dc1efc0cc0f7890be7b256f4
tine20/Addressbook/Config.php
tine20/Calendar/Model/Event.php
tine20/Felamimail/js/MessageEditDialog.js
tine20/Sales/js/InvoiceEditDialog.js
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/js/MainMenu.js
tine20/Tinebase/js/widgets/grid/FilterToolbar.js
tine20/Tinebase/translations/de.po