You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
credo/check/consistency	Bump Copyright to 2021	4 years ago
fixtures	Bump Copyright to 2021	4 years ago
instance_static	support for special chars in pack name	4 years ago
mix	Convert tests to all use clear_config instead of Pleroma.Config.put	4 years ago
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
support	list timeline filtration by params	4 years ago
test_helper.exs	Bump Copyright to 2021	4 years ago