Merge remote-tracking branch 'upstream/pull/1816'
authorTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)
1  2 
app/views/diary_entry/_diary_entry.html.erb