Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 13 Jan 2021 19:11:16 +0000 (22:11 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 13 Jan 2021 19:11:16 +0000 (22:11 +0300)
commite3508988283a0902a7e330995a0c224811956bce
treeedd0a0eb6301980aef5fe02653610929594607cf
parent3e4d84729a4ca8d9779d439a9aa2c8c23b3acd1d
parentf917285b72dbc770be40478e1a55973f29d5db7d
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
20 files changed:
lib/mix/tasks/pleroma/database.ex
lib/pleroma/activity.ex
lib/pleroma/activity/ir/topics.ex
lib/pleroma/application.ex
lib/pleroma/config.ex
lib/pleroma/delivery.ex
lib/pleroma/ecto_enums.ex
lib/pleroma/object.ex
lib/pleroma/repo.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/feed/feed_view.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/pleroma/activity/ir/topics_test.exs
test/pleroma/object_test.exs
test/pleroma/web/activity_pub/activity_pub_test.exs
test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
test/pleroma/web/common_api_test.exs
test/pleroma/web/mastodon_api/views/status_view_test.exs