Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 12:07:36 +0000 (14:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 12:07:36 +0000 (14:07 +0200)
commite8ae39f4208eab6ed4484f9c1ed0d67ef52fac45
tree14e7735eab7a16a7c61ac5f80def1f9c9f9c2456
parenta1ead1505ea5972d183344ae4b27c1b0535d3dd0
parent9355d043c39836e79dee257a8bf91e6366e29090
Merge branch 'pu/2013.03/modelconfig-hr'
tine20/Sales/Model/Contract.php
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js