Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Sep 2015 08:07:57 +0000 (10:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Sep 2015 08:07:57 +0000 (10:07 +0200)
commit7e0a2df8c03d86d281448915d8e19f101715096d
treef70c4d667c18b0a6b52368b6c47d5056bb543ef3
parent19311909559fb9af3c2334ccb4bf6dcda6ba21d7
parentc9443b574947ecd5f84fe121cc838c50d6b5222f
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tests/tine20/TestCase.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/Setup/setup.xml
tine20/Sales/translations/de.po
tine20/Tinebase/Container.php

Change-Id: I4d38bcc23add836bd52d37f468a60a2d5f174521
13 files changed:
tests/tine20/TestCase.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/Update/Release9.php
tine20/Calendar/Setup/setup.xml
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/Setup/Update/Release9.php
tine20/Sales/Setup/setup.xml
tine20/Sales/js/InvoiceEditDialog.js
tine20/Sales/js/PurchaseInvoiceEditDialog.js
tine20/Sales/translations/de.po
tine20/Tinebase/Container.php
tine20/Tinebase/Core.php