Skip to content
Commit 30f1ec25 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into test_annotations_working 

Conflicts:
	lib/private/util.php
parents b7981910 b6d2d632
Expand all 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