Skip to content
Commit a3705ce1 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge branch 'master' into setup 

Conflicts:
	lib/util.php
parents 65aab3dc c7ca8679
Hide whitespace changes
Inline Side-by-side
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