Merge remote-tracking branch 'upstream/pull/2696'

author Tom Hughes <tom@compton.nu>

Wed, 8 Jul 2020 18:09:55 +0000 (19:09 +0100)

committer Tom Hughes <tom@compton.nu>

Wed, 8 Jul 2020 18:09:55 +0000 (19:09 +0100)
author Tom Hughes <tom@compton.nu>
Wed, 8 Jul 2020 18:09:55 +0000 (19:09 +0100)
committer Tom Hughes <tom@compton.nu>
Wed, 8 Jul 2020 18:09:55 +0000 (19:09 +0100)
diff --cc app/assets/stylesheets/common.scss
Simple merge
diff --cc app/assets/stylesheets/small.scss
Simple merge
diff --cc app/views/users/show.html.erb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 8 Jul 2020 18:09:55 +0000 (19:09 +0100)
committer	Tom Hughes <tom@compton.nu>
	Wed, 8 Jul 2020 18:09:55 +0000 (19:09 +0100)
		1	2
app/assets/stylesheets/common.scss	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/small.scss	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/users/show.html.erb	patch \|	diff1 \|	diff2 \|	blob \| history