]> Untitled Git - lemmy.git/commitdiff
Merge remote-tracking branch 'upstream/master' into cake-day
authorFilip785 <fdjuricic98@gmail.com>
Thu, 9 Jul 2020 15:12:43 +0000 (17:12 +0200)
committerFilip785 <fdjuricic98@gmail.com>
Thu, 9 Jul 2020 15:12:43 +0000 (17:12 +0200)
1  2 
ui/src/components/comment-node.tsx
ui/src/utils.ts
ui/translations/en.json

Simple merge
diff --cc ui/src/utils.ts
Simple merge
Simple merge