merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

[rails.git] / app / assets / images / about / sprite@2x.png

diff --git a/app/assets/images/about/sprite@2x.png b/app/assets/images/about/sprite@2x.png
index 65d09d73d6ee1edcde9b43c8052f7d2c8a90b12a..7560c87736d37380c2fda593edc144633ba0dc7b 100644 (file)
Binary files a/app/assets/images/about/sprite@2x.png and b/app/assets/images/about/sprite@2x.png differ