Merge event-attendance into develop

Conflicts:
	include/conversation.php
This commit is contained in:
rabuzarus 2015-10-11 19:28:54 +02:00
commit db7dca3d5f

Diff content is not available