From: Tom Hughes <tom@compton.nu>
Date: Fri, 23 Aug 2013 16:40:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'osmlab/user-display'
X-Git-Tag: live~5862
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fa339033e1f00f4f3e2b9c790c5100a863cf91ac?hp=5965a89dd97fc58cd7b544d49ec32cfb1ae8c39e

Merge remote-tracking branch 'osmlab/user-display'
---

diff --git a/app/assets/images/donate-ad.png b/app/assets/images/donate-ad.png
deleted file mode 100644
index 6effbfe11..000000000
Binary files a/app/assets/images/donate-ad.png and /dev/null differ
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index a89db5078..12b5b82c5 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -74,10 +74,7 @@
         <div class='ads'>
           <%= ad = [{:image => 'sotm-birmingham-ad.png',
                      :title => 'State of the Map Birmingham',
-                     :href =>'http://stateofthemap.org/'},
-                    {:image => 'donate-ad.png',
-                     :title => 'Server Donation Drive',
-                     :href =>'http://donate.openstreetmap.org/'}].sample
+                     :href =>'http://stateofthemap.org/'}].sample
 
               link_to ad[:href], :title => ad[:title] do
                 image_tag ad[:image], :class => :ad