Skip to content
Commit 65413a95 authored by Christopher Schäpers's avatar Christopher Schäpers
Browse files

Merge branch 'master' into oc_avatars 

Conflicts:
	config/config.sample.php
parents e7e3f1b8 431cf06e
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