]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
authorBjoern Schiessle <schiessle@owncloud.com>
Fri, 9 Aug 2013 13:57:07 +0000 (15:57 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Fri, 9 Aug 2013 13:57:07 +0000 (15:57 +0200)
commit44d201a526d89f30de2d6a5f5410f96dd3fff2b2
tree451eb10d8017fccd86c3f1f8ce5f60bbcc8d6041
parent5ba8d38b7fcbdb2f1619f46b2e9513899a61b887
parentc458e785a1612e04b54bb9fbb0f22c0852758fb0
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up