Merge remote-tracking branch 'upstream/pull/2023'
authorTom Hughes <tom@compton.nu>
Sat, 3 Nov 2018 14:34:18 +0000 (14:34 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 3 Nov 2018 14:34:18 +0000 (14:34 +0000)
commit16bef0c8ecad24ac0ca93963196bc844adbb57de
tree3cb4df79a8308c85173deb8d1bcd6aa9a44e1c69
parent391fb933f59075e36e9cea5ea35f5a5efdfc257e
parent8c269aba4e7ab309808570e3c3d47af2d88f414a
Merge remote-tracking branch 'upstream/pull/2023'
Gemfile
Gemfile.lock
app/controllers/diary_entry_controller.rb