]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-1424-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Wed, 13 Feb 2013 00:18:01 +0000 (01:18 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Wed, 13 Feb 2013 00:18:01 +0000 (01:18 +0100)
commitbc43dd704fc89188faadb42d313a41f8b2929c0c
treee3d55e4b2cff99d4bdae91475a7249381c846ba9
parent14e3d77d64a83704d224ca91b5736ec2e94ee01b
parent68fa0b7dcc4a45e4f44b754626440091608ccc85
Merge branch 'master' into fixing-1424-master

Conflicts:
settings/js/users.js