mirror of
https://github.com/friendica/friendica
synced 2025-02-02 02:59:47 +00:00
Merge event-attendance into develop
Conflicts: include/conversation.php
This commit is contained in:
commit
db7dca3d5f
Conflicts: include/conversation.php