Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:39:56 +0000 (21:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:39:56 +0000 (21:39 +0200)
commita55a781ddd42a92b2d183d3748c9117eeebd0f4d
treebad2be34d79055bee5297a14f182f6f1c4cd691b
parentfedb255f8c9d5d5128ce7455abdde9ff9c562bf8
parent9a073f264399d48d6c344c64d1e9b76201c5dc99
Merge branch '2015.11' into 2015.11-develop
tine20/Felamimail/js/MessageEditDialog.js
tine20/Tinebase/js/widgets/mainscreen/WestPanel.js