]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ba8d38 c458e78)
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
authorBjoern Schiessle <schiessle@owncloud.com>
Fri, 9 Aug 2013 13:57:07 +0000 (15:57 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Fri, 9 Aug 2013 13:57:07 +0000 (15:57 +0200)

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