Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts: # package.json
2023-11-17 18:33:39 +09:00 · 2023-11-17 18:33:39 +09:00 · 9e9c76fa57
commit 9e9c76fa57
parent 0e5686a16b f007890e84
7 changed files with 33 additions and 11 deletions
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@ -333,7 +333,11 @@ export default function(props: MfmProps) {
 								class: 'ti ti-clock',
 								style: 'margin-right: 0.25em;',
 							}),
-							h(MkTime, { time: unixtime * 1000, mode: 'detail' }),
+							h(MkTime, {
+								key: Math.random(),
+								time: unixtime * 1000,
+								mode: 'detail',
+							}),
 						]);
 					}
 				}