Skip to content
Commit 690bf9b8 authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'master' into remove_unused_vars 

Conflicts:
	apps/files_encryption/lib/util.php
parents 710e9c2d f8d1c321
Expand all 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