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

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

diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png
index 528d4201c43761606810da17d5d1e7eacae75222..c511bd90fbc7db6e940d6abce045033eca31df44 100644 (file)
Binary files a/app/assets/images/sprite.png and b/app/assets/images/sprite.png differ