Merge branch 'master' into messages
authorAndy Allan <github@gravitystorm.co.uk>
Wed, 3 Oct 2018 12:04:12 +0000 (14:04 +0200)
committerGitHub <noreply@github.com>
Wed, 3 Oct 2018 12:04:12 +0000 (14:04 +0200)
commit5e407dfb34f47e6fbbbf3c11c1a8318256abb5cd
tree70ab9e931cc184bfe38028d1e8e6c61ab0f9b7fb
parentf62f0547bb6d215cf0339c9855ddf8b3597b2006
parentc77429000c55af95056572206a99774711c8d22b
Merge branch 'master' into messages
.rubocop_todo.yml
app/models/notifier.rb
config/routes.rb
test/controllers/messages_controller_test.rb