Merge branch '2016.11-develop' into 2017.02 2017.02
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 07:57:09 +0000 (09:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 07:57:09 +0000 (09:57 +0200)
commitad0bf20cbec89afff710871abeaac6e3ac12b5b1
tree9ecf5dda71dbc52b377c1fffadbeb53c325c5071
parent9f5a96105062d78df44657a3d9792cfebb18225a
parent6a624e461ece34ed6e46f917eeda70e289176ede
Merge branch '2016.11-develop' into 2017.02

Change-Id: I2777aae751aae52bf381399950e07c52fba7b9a1
15 files changed:
tine20/Addressbook/translations/template.pot
tine20/Felamimail/Controller/Message/Send.php
tine20/Timetracker/Setup/Update/Release10.php
tine20/Timetracker/Setup/setup.xml
tine20/Timetracker/js/TimesheetEditDialog.js
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Server/WebDAV.php
tine20/Tinebase/js/LoginPanel.js
tine20/Tinebase/js/tineInit.js
tine20/Tinebase/js/widgets/tags/TagsPanel.js
tine20/composer.json
tine20/composer.lock