From: Dessalines Date: Wed, 29 Jul 2020 04:24:49 +0000 (-0400) Subject: Merge branch 'Axighi-master' into front_end_prettying X-Git-Url: http://these/git/%22https:/image.com/%7B%60%24%7BghostArchiveUrl%7D/static/readmes/README.zh.hans.md?a=commitdiff_plain;h=ff7e0c72f9f568b2929310e15643a4dafd4a0bcc;p=lemmy.git Merge branch 'Axighi-master' into front_end_prettying --- ff7e0c72f9f568b2929310e15643a4dafd4a0bcc diff --cc ui/src/components/inbox.tsx index 1c94032b,927fee24..eff7efcf --- a/ui/src/components/inbox.tsx +++ b/ui/src/components/inbox.tsx @@@ -204,9 -204,9 +204,9 @@@ export class Inbox extends Component +