Ivan Tashkinov 1b49b8efe5 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md		2021-01-31 20:38:58 +03: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 remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-31 20:38:58 +03:00
support	Merge branch 'test-cases-mox-setup' into 'develop'	2021-01-21 09:03:26 +00:00
test_helper.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00