Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
authorlain <lain@soykaf.club>
Tue, 22 Sep 2020 15:13:46 +0000 (17:13 +0200)
committerlain <lain@soykaf.club>
Tue, 22 Sep 2020 15:13:46 +0000 (17:13 +0200)
commitc95859e45b18dec1d00f721ef3c5b4bb1406ea37
treec22f7a200c0e0e551796bf5e9f1b09afccd64dd4
parent9853c90abba213bdc87dccf5620cb0d9eb19c049
parent02f12ec6253093d8bedaf84d78d0f7e533745e1b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
lib/pleroma/chat.ex
lib/pleroma/web/api_spec/operations/chat_operation.ex
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
test/web/pleroma_api/controllers/chat_controller_test.exs