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)
commite49953f141a8a090e96652335882927ce872e375
treece2d1b31174044176c94a97b9a8d6c9eca55f71a
parent7fc00c9314b6d774616ec9bb298f7a4dd2c63b8d
parent6ed749e7ebad5eeff04ccf1a8f33c078b9f46031
Merge remote-tracking branch 'upstream/pull/2239'
app/controllers/diary_entries_controller.rb
test/controllers/diary_entries_controller_test.rb