Nikola Plesa ca7e44d2f0 Fix merge conflicts

2020-10-15 18:15:57 +02:00

..

background_source.js

Use the layer names instead of the IDs in the imagery_used tag (close #7842)

2020-10-08 09:29:50 -04:00

background.js

Make imageryBlocklists return regex objects instead of strings

2020-09-04 10:09:47 -04:00

features.js

Skip editableDataEnabled check in rendererFeatures filters (re: #7706)

2020-06-16 13:19:54 -04:00

index.js

Add photo overlay filter options for hiding flat and pano photos (close #5433)

2019-03-14 14:24:21 -04:00

map.js

Fix the seemingly safe spellings found by codespell

2020-08-10 17:32:37 +01:00

photos.js

Fix merge conflicts

2020-10-15 18:15:57 +02:00

tile_layer.js

Make t function return a span element with a lang attribute unless html: false is specified in the options (re: #7963)

2020-09-15 21:56:22 -04:00