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

author Tom Hughes <tom@compton.nu>

Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)

committer Tom Hughes <tom@compton.nu>

Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)
author Tom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)
committer Tom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)
diff --cc app/views/diary_entry/_diary_entry.html.erb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)
committer	Tom Hughes <tom@compton.nu>
	Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)