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
..
controllers	Merge branch 'develop' into 'fix/2411-mutes-api'	2021-02-02 17:57:58 +00:00
views	Add active user count	2021-01-27 18:20:06 +04:00
mastodon_api.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
websocket_handler.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00