]> git.openstreetmap.org Git - rails.git/commit
Merge branch 'master' into feature/add-communities-page
authorAdam Hoyle <atomoil@gmail.com>
Sat, 10 Sep 2022 15:10:08 +0000 (16:10 +0100)
committerAdam Hoyle <atomoil@gmail.com>
Sat, 10 Sep 2022 15:13:17 +0000 (16:13 +0100)
commit7e5cbe87ed37f9cba8224fa4049047d7f981f66a
tree1c0dcdb6510f22e4f0021d9d0ce16c73857c4591
parent4a6e7b78152446a933dc9bb1364ab00bcf254872
parent9cd96bd452415918be77d6d2094c021b652c9048
Merge branch 'master' into feature/add-communities-page

# Conflicts:
# Gemfile.lock
# package.json
# yarn.lock
Gemfile
Gemfile.lock
app/abilities/ability.rb
app/controllers/site_controller.rb
app/views/layouts/_header.html.erb
config/locales/en.yml
config/routes.rb
package.json
yarn.lock