]> source.dussan.org Git - nextcloud-server.git/commit
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)
commitb4e7258a04f9b634031984aea655ed964aa003d3
tree1ba77b2830ad6b2e1fce436bf5c4e1b8d6e15fe7
parentf3e2a63712e3306c5bb1cad1921da4a3ff542474
parent30b8f4ec8e3dbf8e2d5d3627e0447bc20da50335
Merge branch 'master' into encryption_check_if_file_is_encrypted