]> source.dussan.org Git - nextcloud-server.git/commit
Merge pull request #3484 from owncloud/files_encryption_stable5
authorBjörn Schießle <bjoern@schiessle.org>
Fri, 24 May 2013 21:09:50 +0000 (14:09 -0700)
committerBjörn Schießle <bjoern@schiessle.org>
Fri, 24 May 2013 21:09:50 +0000 (14:09 -0700)
commite044260bc111f54e247741ea8e78b227014c83ae
tree69746c0db8897e9683bf5b43973c9165c9018b96
parent1a638cd3a8943c4073dff2f6490b620b4b4fe577
parent12f5b5ce6146de9fe4b85d09ba6c502ba946ef7c
Merge pull request #3484 from owncloud/files_encryption_stable5

file encryption app backport master -> stable5