Merge branch 'remove/mastofe' into 'develop'
Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392
This commit is contained in:
commit
6b3842cf50
3705 changed files with 25 additions and 11356 deletions
|
|
@ -1649,7 +1649,6 @@ defmodule Pleroma.UserTest do
|
|||
ap_enabled: true,
|
||||
is_moderator: true,
|
||||
is_admin: true,
|
||||
mastofe_settings: %{"a" => "b"},
|
||||
mascot: %{"a" => "b"},
|
||||
emoji: %{"a" => "b"},
|
||||
pleroma_settings_store: %{"q" => "x"},
|
||||
|
|
@ -1691,7 +1690,6 @@ defmodule Pleroma.UserTest do
|
|||
ap_enabled: false,
|
||||
is_moderator: false,
|
||||
is_admin: false,
|
||||
mastofe_settings: nil,
|
||||
mascot: nil,
|
||||
emoji: %{},
|
||||
pleroma_settings_store: %{},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue