]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: effea79 b9fc240)
Merge branch 'master' into close-session-faster-master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 19 Mar 2014 10:44:21 +0000 (11:44 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 19 Mar 2014 10:44:21 +0000 (11:44 +0100)
Conflicts:
apps/files/ajax/upgrade.php


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