Merge branch 'features/glitch-soc-frontend' into 'develop'

Features/glitch soc frontend See merge request pleroma/pleroma!192
2019-01-31 10:16:11 +00:00 · 2019-01-31 10:16:11 +00:00 · 00d4333373
commit 00d4333373
parent 5f40f4f74d cda1470e02
9 changed files with 162 additions and 11 deletions
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@ -92,6 +92,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
      replies_count: 0,
      favourites_count: 0,
      reblogged: false,
+      bookmarked: false,
      favourited: false,
      muted: false,
      pinned: false,