Merge branch 'pu/inventory'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Nov 2012 09:17:38 +0000 (10:17 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Nov 2012 09:17:38 +0000 (10:17 +0100)
commit75f9ee877e615951c4cd302ce482392d121c2feb
treea407104c80710ffce33942126eb82b49c51192a2
parentcf77b4313c272471dd8c7abbcc5ab1717db474b9
parentae2514391b7ccd4d2deb4d228393804b505211de
Merge branch 'pu/inventory'

- added update script 7.1 -> 7.2 (6.2)

Conflicts:
tine20/Inventory/Setup/Update/Release6.php
tine20/Inventory/Setup/setup.xml
tine20/Inventory/translations/hr_HR.po
tine20/Inventory/translations/it.po
tine20/Inventory/Setup/Update/Release6.php
tine20/Inventory/Setup/Update/Release7.php
tine20/Inventory/Setup/setup.xml
tine20/Tinebase/js/ApplicationStarter.js