Skip to content
Snippets Groups Projects
Commit f1518a54 authored by Christopher Schäpers's avatar Christopher Schäpers
Browse files

Merge branch 'master' into clean_up_util 

Conflicts:
	lib/util.php
parents 65d80232 de949b1c
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 402 additions and 366 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