Merge pull request #4813 from AntonKhorev/no-fst-italic

author Andy Allan <git@gravitystorm.co.uk>

Wed, 19 Jun 2024 14:34:14 +0000 (15:34 +0100)

committer GitHub <noreply@github.com>

Wed, 19 Jun 2024 14:34:14 +0000 (15:34 +0100)
author Andy Allan <git@gravitystorm.co.uk>
Wed, 19 Jun 2024 14:34:14 +0000 (15:34 +0100)
committer GitHub <noreply@github.com>
Wed, 19 Jun 2024 14:34:14 +0000 (15:34 +0100)
diff --cc app/views/changesets/show.html.erb
Simple merge
diff --cc app/views/traces/_trace.html.erb
Simple merge
author	Andy Allan <git@gravitystorm.co.uk>
	Wed, 19 Jun 2024 14:34:14 +0000 (15:34 +0100)
committer	GitHub <noreply@github.com>
	Wed, 19 Jun 2024 14:34:14 +0000 (15:34 +0100)
		1	2
app/views/changesets/show.html.erb	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/traces/_trace.html.erb	patch \|	diff1 \|	diff2 \|	blob \| history