Skip to content
Commit 30330b43 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Merge branch 'master' into move-storages 

Conflicts:
	tests/lib/files/view.php
parents 3b6d850e 69886251
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