feld 008499f65a Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md		2021-02-03 14:23:23 +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/2412-filters'	2021-02-03 14:23:23 +00:00
support	Merge branch 'develop' into 'fix/2412-filters'	2021-02-03 14:23:23 +00:00
test_helper.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00