From: hikemaniac <31667811+hikemaniac@users.noreply.github.com>
Date: Fri, 18 May 2018 11:59:59 +0000 (+0200)
Subject: Rebase to current master
X-Git-Tag: live~3029^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/908f9b5276602f21f7d492c9949c934dfb1e9365?hp=1cea6b363aab3f67caa3cd5ef0b0eea9bcea5c2b

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 f497a22d8..a80966ee1 100644
--- 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'); }