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

author Tom Hughes <tom@compton.nu>

Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)

committer Tom Hughes <tom@compton.nu>

Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)
author Tom Hughes <tom@compton.nu>
Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)
committer Tom Hughes <tom@compton.nu>
Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)
diff --cc app/controllers/api/tracepoints_controller.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)
committer	Tom Hughes <tom@compton.nu>
	Wed, 9 Dec 2020 14:51:04 +0000 (14:51 +0000)