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

Merge branch 'master' into routing 

Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
parents c2b4e534 44287d68
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1163 additions and 744 deletions
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