Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex		2021-02-23 13:58:35 +03:00
..
config	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
credo/check/consistency	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
fixtures	not used mock	2021-02-10 18:44:49 +03: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 remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-23 13:58:35 +03: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