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)
commitc174845258f8bb55d5fa969563604b14dedea210
treec2ca7494562770d87a315424ec2a17c87dc38e1b
parentb897832349ad0878e950ed177b7a050efb9a4a7c
parent45e6ebcafc5741750357b7fd6e11ec96c2cbfb24
Merge remote-tracking branch 'upstream/pull/1816'
app/views/diary_entry/_diary_entry.html.erb