Merge branch 'master' into cancancan
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 31 Oct 2018 10:16:47 +0000 (11:16 +0100)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 31 Oct 2018 10:16:47 +0000 (11:16 +0100)
commitf11221f05bcdd05edd7a9f97d6d57e7baaeb4921
tree143da4cd00d56ef79be800fba274a9a2d139fa7a
parent0888f43d7b5a5e23874ff1a291049b90481d1273
parentad85a03e21fdeaa050d5b8ca075ab2ffe36d5a34
Merge branch 'master' into cancancan
app/controllers/application_controller.rb
config/locales/en.yml