Commit 800b3359 authored by Brion Vibber's avatar Brion Vibber

Merge commit 'origin/master' into testing

Conflicts:
	classes/Notice.php
parents 69722257 fd608c0d
Markdown is supported
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