Skip to content
Snippets Groups Projects
Commit c398fc59 authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'master' into remove_unused_vars 

Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
parents 09b54ccb 7c0c6bd7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 39 deletions
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