]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'stable5' into fix_enc_migration
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 27 May 2013 12:28:26 +0000 (14:28 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 27 May 2013 12:28:26 +0000 (14:28 +0200)
commit9ac29cd122fe03c61e537af09ae229710b80341a
tree71e310a2a5453abb8a63fcac79bef29afe5392ae
parent087b21c913d33bcf9447829c6a2a7378bdb0a8e5
parent55e4e054d6ff62e6e1232f66184dd534dce1af00
Merge branch 'stable5' into fix_enc_migration
apps/files_encryption/tests/crypt.php