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
..
credo/check/consistency	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
fixtures	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
instance_static
mix	Convert tests to all use clear_config instead of Pleroma.Config.put	2021-01-26 11:58:43 -06:00
pleroma	Merge branch 'develop' into 'fix/2411-mutes-api'	2021-02-02 17:57:58 +00:00
support	list timeline filtration by params	2021-02-01 14:11:12 +03:00
test_helper.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00