Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 29 Sep 2015 13:25:04 +0000 (15:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 29 Sep 2015 13:25:04 +0000 (15:25 +0200)
commitc0a9e458965a0119610fc5b0d8b6d5e432f94be1
tree58b500df273ef78984763c108baa6cff0cf3d9f0
parent76c271670b15e9f3c5a4a6996daf3856dc21edc1
parent902298ac456e58827bee95a9940d85d1afc9e1d6
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Addressbook/js/ContactEditDialog.js
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/Setup/setup.xml
tine20/Sales/translations/de.po

Change-Id: I587670b52bf5d6e44c829f616f9755027959786f
tests/tine20/Tinebase/Frontend/CliTest.php
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/js/InvoiceEditDialog.js
tine20/Sales/translations/de.po
tine20/Tinebase/User.php