diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-06-04 15:34:55 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-06-04 15:34:55 +0000 |
commit | ab4915edcbf25009ea29cba6bd4fe6758642a40e (patch) | |
tree | 9429af6f5923c944e85cd8f9d4d2e935c419a360 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | f178a6f3f0d152a5e75c82da08195ee2d7fd3612 (diff) | |
parent | a3a7178b604d8bc589a8e3ac06abac094cce5e17 (diff) | |
download | pleroma-ab4915edcbf25009ea29cba6bd4fe6758642a40e.tar.gz |
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
0 files changed, 0 insertions, 0 deletions