Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 26 Dec 2020 19:23:05 +0000 (22:23 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 26 Dec 2020 19:23:05 +0000 (22:23 +0300)
commit4134abef63e1165f5701741c1012e64cb908654c
treebf531d2f464297c46edeaaf02e6966c1695934a5
parentcbb19d0e1882f5ce641f30b51d7156336f81aba9
parente4f1d8f48c85b8a388d6c3945db157de5ce588c5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
lib/pleroma/object.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/pleroma/web/mastodon_api/views/status_view_test.exs