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 'admin-api-change-password' into 'develop'	2020-03-31 13:41:47 +03:00
views	Merge branch 'bugfix/funkwhale-channel' into 'develop'	2020-04-02 22:55:09 +03:00
mastodon_api.ex	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
websocket_handler.ex	Update Copyrights	2020-03-03 16:44:49 -06:00