Merge remote-tracking branch 'upstream/master' into cake-day

author Filip785 <fdjuricic98@gmail.com>

Wed, 8 Jul 2020 15:21:44 +0000 (17:21 +0200)

committer Filip785 <fdjuricic98@gmail.com>

Wed, 8 Jul 2020 15:21:44 +0000 (17:21 +0200)
author Filip785 <fdjuricic98@gmail.com>
Wed, 8 Jul 2020 15:21:44 +0000 (17:21 +0200)
committer Filip785 <fdjuricic98@gmail.com>
Wed, 8 Jul 2020 15:21:44 +0000 (17:21 +0200)
diff --cc ui/src/components/comment-node.tsx
Simple merge
diff --cc ui/src/components/post-listing.tsx
Simple merge
diff --cc ui/src/components/user.tsx
Simple merge
author	Filip785 <fdjuricic98@gmail.com>
	Wed, 8 Jul 2020 15:21:44 +0000 (17:21 +0200)
committer	Filip785 <fdjuricic98@gmail.com>
	Wed, 8 Jul 2020 15:21:44 +0000 (17:21 +0200)
		1	2
ui/src/components/comment-node.tsx	patch \|	diff1 \|	diff2 \|	blob \| history
ui/src/components/post-listing.tsx	patch \|	diff1 \|	diff2 \|	blob \| history
ui/src/components/user.tsx	patch \|	diff1 \|	diff2 \|	blob \| history