fix conflicts

2024-04-07 15:42:28 +00:00
parent ece86f756d bb7b4a8ea4
commit d6c736f1a5
30 changed files with 185 additions and 31 deletions
@@ -19,6 +19,7 @@ namespace Entity {
    content: string
    plain_content?: string | null
    created_at: string
+    edited_at: string | null
    emojis: Emoji[]
    replies_count: number
    reblogs_count: number