Skip to content
Commit c216c477 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into close-session-faster-master 

Conflicts:
	apps/files/ajax/upgrade.php
parents effea790 b9fc240b
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