Skip to content
Commit 221a6508 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into activities-api 

Conflicts:
	lib/private/server.php
parents 852a50aa 2fe9294c
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