Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 9 Jan 2019 16:26:38 +0000 (16:26 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 9 Jan 2019 16:26:38 +0000 (16:26 +0000)
commit1881680e28273035333a121e2135781f1ae3f15a
tree261953accd5210c4e5474c7ce23b443eafac6f5c
parent5c5c8508c203886f32b150e7d8c1f7362a4fde0e
parent8df348a3daaa9c5ac9693fd52b62594dfe9158be
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'

Scarlett/pleroma summary html api

See merge request pleroma/pleroma!647
lib/pleroma/web/twitter_api/views/activity_view.ex
test/web/twitter_api/views/activity_view_test.exs