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

[rails.git] / app / assets / images / welcome-sprite.png

diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png
index a97b8e7fc75dc66032d693a1b46872d18a025c85..30d93d7e1a1dda1d40cf266ff67c5502825d6c8e 100644 (file)
Binary files a/app/assets/images/welcome-sprite.png and b/app/assets/images/welcome-sprite.png differ