]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
authorFlorin Peter <github@florin-peter.de>
Tue, 7 May 2013 20:19:58 +0000 (22:19 +0200)
committerFlorin Peter <github@florin-peter.de>
Tue, 7 May 2013 20:19:58 +0000 (22:19 +0200)
commitf82fb0e160704138a5bd1482e7217aa85ee0b6e3
treebfc2bbf00826ebe466e6830a92d85bf67aafd1c0
parentcdf4bec6a1f9b30ca9b8e5a121582689c91c351d
parent763c8f78ed8ab4178eeece3a1a4233c56e0da73e
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption