Skip to content
Commit 09b54ccb authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'master' into remove_unused_vars 

Conflicts:
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/util.php
parents 3a76c223 086c33ef
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