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

Merge branch 'master' into convert-oc_config 

Conflicts:
	lib/config.php
parents 492a3573 02d2e41e
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