]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c95d1b2 6ca2da7)
Merge branch 'master' into patch-1
authorJohannesKleine <johannes@was-tun.org>
Sat, 2 Jan 2016 20:56:45 +0000 (21:56 +0100)
committerJohannesKleine <johannes@was-tun.org>
Sat, 2 Jan 2016 20:56:45 +0000 (21:56 +0100)

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