From: rabuzarus <trebor@central-unit>
Date: Sun, 11 Oct 2015 17:28:54 +0000 (+0200)
Subject: Merge event-attendance into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=db7dca3d5f7416cfb5378bbfa10cf87924108a0e;p=friendica.git

Merge event-attendance into develop
Conflicts:
	include/conversation.php
---

db7dca3d5f7416cfb5378bbfa10cf87924108a0e