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

author Tom Hughes <tom@compton.nu>

Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)

committer Tom Hughes <tom@compton.nu>

Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)
author Tom Hughes <tom@compton.nu>
Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)
committer Tom Hughes <tom@compton.nu>
Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)
diff --cc app/controllers/diary_entries_controller.rb
Simple merge
diff --cc test/controllers/diary_entries_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)
committer	Tom Hughes <tom@compton.nu>
	Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)
		1	2
app/controllers/diary_entries_controller.rb	patch \|	diff1 \|	diff2 \|	blob \| history
test/controllers/diary_entries_controller_test.rb	patch \|	diff1 \|	diff2 \|	blob \| history