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)
commitbf06b63b828137baf21b2f6d591d00678514048f
treecd1b1bf0b194b68b48bbdc9c53ca338c897245f3
parentd1afbb9cf5b678851ba88753ea0fe7ee39e7309a
parent39dc380a6c3afc6df130b3f3f4f1e54959e862d7
Merge branch '2013.10' into 2014.11
tine20/Tinebase/User.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js