Skip to content
Snippets Groups Projects
Commit 5eba5798 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge branch 'master' into routing 

Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
parents b483f2aa 3829460a
Show whitespace changes
Inline Side-by-side
Showing
with 253 additions and 140 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment