Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 5 Feb 2020 04:56:36 +0000 (07:56 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 5 Feb 2020 04:56:36 +0000 (07:56 +0300)
1  2 
config/config.exs
config/description.exs
lib/pleroma/activity.ex
test/web/activity_pub/transmogrifier_test.exs

Simple merge
Simple merge
Simple merge