Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jul 2015 10:29:37 +0000 (12:29 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jul 2015 10:29:37 +0000 (12:29 +0200)
commitcc2cf9f344f992e24da63645c49dcc7be14d0b8f
treecfc490a26ab1f0a8792cc38d1e18d19c89e27436
parent74e9a8c29bbc13332128009444de3a07705170cf
parentb711ff8772e9c5a6c02743be699e2abc70143651
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Sales/js/PurchaseInvoiceEditDialog.js

Change-Id: I7982f6e212437969438430798050198b3b523a14
tine20/Sales/js/CustomerEditDialog.js
tine20/Sales/js/InvoiceEditDialog.js
tine20/Sales/js/PurchaseInvoiceEditDialog.js
tine20/Sales/js/SupplierEditDialog.js
tine20/Timetracker/js/TimeaccountEditDialog.js