diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-10 02:39:53 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-10 02:39:53 +0000 |
| commit | 7f5efddd6ed60fead5b456186b67a96dde95e6b9 (patch) | |
| tree | 3eff28d7cb47c7fb5e4bd61ab2f8a4cddf0b530e /test/web/twitter_api/views | |
| parent | f85d108c4181fbccf417f47d15915706c457cf1c (diff) | |
| parent | 6cbe63726d298ae85a75efa7591a54394469525e (diff) | |
| download | pleroma-7f5efddd6ed60fead5b456186b67a96dde95e6b9.tar.gz pleroma-7f5efddd6ed60fead5b456186b67a96dde95e6b9.zip | |
Merge branch 'feature/pinned-posts' into 'develop'
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
Diffstat (limited to 'test/web/twitter_api/views')
| -rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index 5294204c6..8b5a16add 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do @@ -136,6 +136,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do "possibly_sensitive" => false, "repeat_num" => 0, "repeated" => false, + "pinned" => false, "statusnet_conversation_id" => convo_id, "summary" => "", "summary_html" => "", |