Skip to content
Snippets Groups Projects
Commit e5c84488 authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption 

Conflicts:
	apps/files_encryption/lib/keymanager.php
parents cb5d935b 9f51841c
No related branches found
No related tags found
No related merge requests found
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