Commit 87d46e1a authored by Evan Prodromou's avatar Evan Prodromou

Merge branch 'master' into 1.0.x

Conflicts:
	plugins/Realtime/RealtimePlugin.php
parents 11f45e57 afd42611
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