Skip to content
Snippets Groups Projects
Commit 23896a72 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fixing-784-master

Conflicts:
	apps/files/js/files.js
parents bae17551 60489764
Loading
Showing
with 168 additions and 98 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment