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

Merge develop into 20170316_-_fix_event_edit

Conflicts:
	mod/events.php
---

0060e2449e4f225436964a8203b706ddd3e0d01f