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

Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/js/files.js
parents bfc55fef 60489764
Branches
No related tags found
No related merge requests found
Showing
with 167 additions and 96 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment