Merge pull request #2266 from systemed/patch-2

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

Wed, 28 Aug 2019 13:20:21 +0000 (15:20 +0200)

committer GitHub <noreply@github.com>

Wed, 28 Aug 2019 13:20:21 +0000 (15:20 +0200)
author Andy Allan <git@gravitystorm.co.uk>
Wed, 28 Aug 2019 13:20:21 +0000 (15:20 +0200)
committer GitHub <noreply@github.com>
Wed, 28 Aug 2019 13:20:21 +0000 (15:20 +0200)
diff --cc app/views/diary_entries/_diary_entry.html.erb
Simple merge
author	Andy Allan <git@gravitystorm.co.uk>
	Wed, 28 Aug 2019 13:20:21 +0000 (15:20 +0200)
committer	GitHub <noreply@github.com>
	Wed, 28 Aug 2019 13:20:21 +0000 (15:20 +0200)