Skip to content
Commit 4ab36142 authored by Florin Peter's avatar Florin Peter
Browse files

Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master 

Trashbin for encryption keys now against master
parents b4649701 7a3ecd04
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment