]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Fri, 17 May 2013 09:20:17 +0000 (11:20 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Fri, 17 May 2013 09:20:17 +0000 (11:20 +0200)
commit0b40c1d08a107ddb0637a2793d3f044d4dfefa88
tree34441fde8776d90c6e8bccae98828de863b9601c
parentca6a77d39b738aeead0bbbfdfdf2a06382431f6f
parentd7dc710c8b1d46947cb2afe13152e0adc9ee5594
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
apps/files_encryption/lib/util.php