Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 2 Mar 2020 15:41:12 +0000 (18:41 +0300)
commit99a6c660a909d8c74289015b3f69357196256112
tree9225c2fa6d49b6d487e188d58f5da04387c66bf4
parent0cf1d4fcd0c15594f663101061670a4555132840
parent45b08ca1665920564c9daf35a96e93dff031a649
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/activity_pub/publisher_test.exs
test/web/feed/user_controller_test.exs
test/web/twitter_api/util_controller_test.exs