]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30c2c2c 4f7c7c6)
Merge branch 'master' into phpunit
authorRobin Appelman <icewind@owncloud.com>
Fri, 5 Oct 2012 20:13:41 +0000 (22:13 +0200)
committerRobin Appelman <icewind@owncloud.com>
Fri, 5 Oct 2012 20:13:41 +0000 (22:13 +0200)

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