Merge branch 'feature/pinned-posts' into 'develop'

Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/representers/activity_representer.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/views/activity_view.ex
Simple merge

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/twitter_api/representers/activity_representer_test.exs
Simple merge

diff --cc test/web/twitter_api/views/activity_view_test.exs
index 5294204c6fda97e03dfc3d4a294ab2461b6d99ad,37444030023aff0921a97762484c337c84d6a245..8b5a16add9b12d30f0cf0be0c067620e01ee469e
--- 1/test/web/twitter_api/views/activity_view_test.exs
--- 2/test/web/twitter_api/views/activity_view_test.exs
+++ b/test/web/twitter_api/views/activity_view_test.exs
@@@ -136,9 -132,9 +136,10 @@@ defmodule Pleroma.Web.TwitterAPI.Activi
        "possibly_sensitive" => false,
        "repeat_num" => 0,
        "repeated" => false,
+       "pinned" => false,
        "statusnet_conversation_id" => convo_id,
        "summary" => "",
 +      "summary_html" => "",
        "statusnet_html" =>
          "Hey <span><a data-user=\"#{other_user.id}\" href=\"#{other_user.ap_id}\">@<span>shp</span></a></span>!",
        "tags" => [],