Merge remote-tracking branch 'upstream/pull/2667'
authorTom Hughes <tom@compton.nu>
Wed, 5 Aug 2020 20:50:08 +0000 (21:50 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 5 Aug 2020 20:50:08 +0000 (21:50 +0100)
commitc24c2e481cc6d27e76274ed4e32668a4690a7788
treefacef8ffbdf1f4b282b10cc73001037591e1300d
parent2d73dc22a2c167b9ac1140e68129af97560b6646
parent8d2271699bfe8199ebeac2d2bf491e2133cc02d8
Merge remote-tracking branch 'upstream/pull/2667'
13 files changed:
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/leaflet.layers.js
app/assets/stylesheets/common.scss
app/views/browse/changeset.html.erb
app/views/browse/new_note.html.erb
app/views/browse/note.html.erb
app/views/site/export.html.erb
app/views/users/confirm.html.erb
config/locales/en.yml
package.json
yarn.lock