feld 008499f65a Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md		2021-02-03 14:23:23 +00:00
..
controllers	Merge branch 'develop' into 'fix/2412-filters'	2021-02-03 14:23:23 +00:00
views	Merge branch 'email-stub-in-verify-credentials' into 'develop'	2021-02-02 18:35:08 +00: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