]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14e3d77 68fa0b7)
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)
Conflicts:
settings/js/users.js


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server