Merge branch 'feature/pinned-posts' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 10 Jan 2019 02:39:53 +0000 (02:39 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 10 Jan 2019 02:39:53 +0000 (02:39 +0000)
commit7f5efddd6ed60fead5b456186b67a96dde95e6b9
tree3eff28d7cb47c7fb5e4bd61ab2f8a4cddf0b530e
parentf85d108c4181fbccf417f47d15915706c457cf1c
parent6cbe63726d298ae85a75efa7591a54394469525e
Merge branch 'feature/pinned-posts' into 'develop'

Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
config/config.exs
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/twitter_api/representers/activity_representer.ex
lib/pleroma/web/twitter_api/views/activity_view.ex
test/web/activity_pub/activity_pub_test.exs
test/web/twitter_api/representers/activity_representer_test.exs
test/web/twitter_api/views/activity_view_test.exs