Merge remote-tracking branch 'upstream/pull/2239'
authorTom Hughes <tom@compton.nu>
Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)
1  2 
app/controllers/diary_entries_controller.rb
test/controllers/diary_entries_controller_test.rb