]> git.openstreetmap.org Git - rails.git/commitdiff
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)
1  2 
app/controllers/application_controller.rb
config/locales/en.yml

Simple merge