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

Merge branch 'master' into convert-oc_config 

Conflicts:
	lib/config.php
	lib/setup.php
parents 969e43c8 6fcee1ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 218 additions and 47 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