Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 25 Jan 2021 18:24:07 +0000 (21:24 +0300)
commit694d98be550b0afe5b110c7f3c63e9cb382f2c90
treec9dfbf9a6521071537328ac40d1b1a471eadcfaa
parentea4785213a449f3bcd68bcb4ecb3bb6d794736b1
parentf1c82fbd426651e6838a9c60578c96a25ae94df4
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
test/pleroma/web/common_api_test.exs