Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:39:29 +0000 (13:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:39:29 +0000 (13:39 +0100)
1  2 
tine20/Tinebase/User.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js

Simple merge