mirror of https://github.com/friendica/friendica
Merge event-attendance into develop
Conflicts: include/conversation.php
This commit is contained in:
commit
db7dca3d5f
Conflicts: include/conversation.php