mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
fix merge error
This commit is contained in:
parent
94bb798d72
commit
27600f0e79
@ -73,7 +73,7 @@ export default {
|
||||
RETURN message {
|
||||
.*,
|
||||
room: properties(room)
|
||||
otherUser: properties(otherUser)
|
||||
otherUser: properties(otherUser),
|
||||
senderId: currentUser.id,
|
||||
username: currentUser.name,
|
||||
avatar: image.url,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user