Merge remote-tracking branch 'upstream/pull/1987'
authorTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 18:09:31 +0000 (19:09 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 18:09:31 +0000 (19:09 +0100)
commit297b0a0e166bab17cc6555deeefaf328f202bd72
tree2defe810393780aad3ea19a5fd539a5613843224
parent276599d34fcbd7babc8e34b6859459cb44acabe7
parent1d2a3841ab525308717ce783d0d421cb9aa741de
Merge remote-tracking branch 'upstream/pull/1987'
test/controllers/diary_entry_controller_test.rb
test/controllers/traces_controller_test.rb
test/controllers/user_controller_test.rb