Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 8 Feb 2020 16:59:37 +0000 (19:59 +0300)
commit4e6bbdc7b549e630141cb10d383a42055f06dc16
treed0675328c7fc75f612eab779289afabee27a40a8
parentd458f4fdcafe847a7db8b1c663cfd945019816b7
parent964b4d82a0cde5b552b6210400c5e2c747a2f0e0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
CHANGELOG.md
config/config.exs
config/description.exs
lib/pleroma/activity.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
test/web/activity_pub/transmogrifier_test.exs