Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit

Conflicts:
	mod/events.php
This commit is contained in:
rabuzarus 2017-03-20 17:16:39 +01:00
commit d1d33dc79a

Diff content is not available