projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
views
/
chat_message_view.ex
diff --git
a/lib/pleroma/web/pleroma_api/views/chat_message_view.ex
b/lib/pleroma/web/pleroma_api/views/chat_message_view.ex
index 28f12d9b066921f47d8af8fdda0846f7cfd349c2..a821479ab7a3fac98a0bbc73707b01fb3c4c8a46 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/views/chat_message_view.ex
+++ b/
lib/pleroma/web/pleroma_api/views/chat_message_view.ex
@@
-6,9
+6,9
@@
defmodule Pleroma.Web.PleromaAPI.ChatMessageView do
use Pleroma.Web, :view
alias Pleroma.Chat
+ alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
- alias Pleroma.User
def render(
"show.json",