Ivan Tashkinov 4e14945670 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/activity_pub/activity_pub.ex		2021-02-03 09:31:38 +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	support for special chars in pack name	2020-09-24 09:12:37 +03:00
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-03 09:31:38 +03: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