From: rabuzarus <>
Date: Mon, 20 Mar 2017 16:16:39 +0000 (+0100)
Subject: Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d1d33dc79a4aac3a982f85dbadfb61070851de68;p=friendica.git

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

Conflicts:
	mod/events.php
---

d1d33dc79a4aac3a982f85dbadfb61070851de68