Skip to content
Snippets Groups Projects
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
Loading
Showing
with 228 additions and 197 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment