]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3e2a63 30b8f4e)
Merge branch 'master' into encryption_check_if_file_is_encrypted
authorBjoern Schiessle <schiessle@owncloud.com>
Wed, 20 Nov 2013 13:45:04 +0000 (14:45 +0100)
committerBjoern Schiessle <schiessle@owncloud.com>
Wed, 20 Nov 2013 13:45:04 +0000 (14:45 +0100)

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