Haelwenn 01a3f145d5 Merge branch 'bugfix/funkwhale-channel' into 'develop' ... Fix profile url for funkwhale channels, removes one source_data use Closes #1653 See merge request pleroma/pleroma!2333		2020-04-02 22:55:09 +03:00
..
controllers	Merge branch 'bugfix/profile-bio-newline' into 'develop'	2020-03-31 13:42:02 +03:00
views	Merge branch 'bugfix/funkwhale-channel' into 'develop'	2020-04-02 22:55:09 +03:00
mastodon_api_controller_test.exs	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
mastodon_api_test.exs	Update Copyrights	2020-03-03 16:44:49 -06:00