Skip to content
Snippets Groups Projects
Commit ae3425d2 authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Merge branch 'master' into securityutils 

Conflicts:
	lib/private/util.php
parents 3329e0f2 73685892
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 26 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