hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation

Browse source
This commit is contained in:
lain 2020-07-27 16:19:45 +02:00
commit 762c9ea564
23 changed files with 699 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/api_spec/operations/chat_operation.ex
View file

@ -300,11 +300,11 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
"content" => "Check this out :firefox:",
"id" => "13",
"chat_id" => "1",
"actor_id" => "someflakeid",
"account_id" => "someflakeid",
"unread" => false
},
%{
"actor_id" => "someflakeid",
"account_id" => "someflakeid",
"content" => "Whats' up?",
"id" => "12",
"chat_id" => "1",