Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Jan 2017 11:33:30 +0000 (12:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Jan 2017 11:33:30 +0000 (12:33 +0100)
1  2 
tine20/Inventory/js/InventoryItemEditDialog.js
tine20/Tinebase/WebDav/Container/Abstract.php
tine20/Tinebase/css/Tinebase.css

Simple merge