feld d289ad8579 Merge branch 'develop' into 'fix/2411-mutes-api' ... # Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md		2021-02-02 17:57:58 +00:00
..
mix	Ensure consistent behavior between pleroma.user activate/deactivate mix tasks	2021-01-25 10:48:28 -06:00
phoenix/transports/web_socket	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
pleroma	Merge branch 'develop' into 'fix/2411-mutes-api'	2021-02-02 17:57:58 +00:00