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 (file)
index 6effbfe..0000000
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 a89db50787d8f6a7aef22df58297cfd7aa3bc803..12b5b82c5c358c9aa123e16c739b53fce0b61019 100644 (file)
--- 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