Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex		2020-04-02 19:38:39 +03:00
..
gettext
repo	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	2020-04-01 20:08:14 +03:00
scrubbers
static	Update AdminFE build in preparation for Pleroma 2.0.2	2020-03-31 13:05:16 -05:00
templates	dynamic_configuration renaming	2020-01-10 19:34:19 +03:00