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

author Tom Hughes <tom@compton.nu>

Thu, 8 Nov 2018 17:51:23 +0000 (17:51 +0000)

committer Tom Hughes <tom@compton.nu>

Thu, 8 Nov 2018 17:51:23 +0000 (17:51 +0000)
author Tom Hughes <tom@compton.nu>
Thu, 8 Nov 2018 17:51:23 +0000 (17:51 +0000)
committer Tom Hughes <tom@compton.nu>
Thu, 8 Nov 2018 17:51:23 +0000 (17:51 +0000)
diff --cc test/controllers/redactions_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Thu, 8 Nov 2018 17:51:23 +0000 (17:51 +0000)
committer	Tom Hughes <tom@compton.nu>
	Thu, 8 Nov 2018 17:51:23 +0000 (17:51 +0000)