Merge remote-tracking branch 'upstream/pull/2014'
authorTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 17:59:33 +0000 (18:59 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 3 Oct 2018 17:59:33 +0000 (18:59 +0100)
1  2 
.rubocop.yml
.rubocop_todo.yml
app/controllers/messages_controller.rb
app/models/notifier.rb
config/routes.rb
test/controllers/messages_controller_test.rb

diff --cc .rubocop.yml
Simple merge
Simple merge
Simple merge
Simple merge