Rebase to current master

Merge openstreetmap/openstreetmap-website into hikemaniac/openstreetmap-website

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
index f497a22d86db7eb994ada531fbc07dc26110ed18..a80966ee142f9e96f9519373827ce8c3af5f4b74 100644 (file)
--- a/app/assets/stylesheets/browse.scss
+++ b/app/assets/stylesheets/browse.scss
@@ -92,7 +92,7 @@
   .railway.level_crossing::before { content: image-url('browse/level_crossing.p.16.png'); }
 
   .shop::before { content: image-url('browse/shop_convenience.p.16.png'); }
-  .shop.alcohol::before { content: image-url('browse/shop_alcohol.16.pn'); }
+  .shop.alcohol::before { content: image-url('browse/shop_alcohol.16.png'); }
   .shop.bakery::before { content: image-url('browse/shop_bakery.16.png'); }
   .shop.bicycle::before { content: image-url('browse/shop_bicycle.16.png'); }
   .shop.books::before { content: image-url('browse/shop_books.16.png'); }