Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into...
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 10 Oct 2018 09:26:30 +0000 (11:26 +0200)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 10 Oct 2018 09:26:30 +0000 (11:26 +0200)
commit420a7289a0b08eee091f6650c2e83166df3fbe69
tree2575dddfa55d697c5ff380c535d6a018ce8e5fa9
parent4530f6e3e4a327f5adf348f1cb69fd1ef0bd90f9
parent25256a484914ee40d829d9184fb4107dd0a77d44
Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into rubyforgood-authz
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/diary_entry_controller.rb
app/controllers/site_controller.rb
app/controllers/users_controller.rb
test/test_helper.rb