feld 008499f65a Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md		2021-02-03 14:23:23 +00:00
..
cron	Convert tests to all use clear_config instead of Pleroma.Config.put	2021-01-26 11:58:43 -06:00
purge_expired_activity_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
purge_expired_filter_test.exs	support for expires_in/expires_at in filters	2021-01-26 08:27:45 +03:00
purge_expired_token_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
scheduled_activity_worker_test.exs	fix for scheduled post with poll	2021-02-01 18:22:26 +03:00