From: Tom Hughes <tom@compton.nu>
Date: Wed, 20 Apr 2011 18:23:39 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5091^2~184^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8980da4381923d8099a11a1334baf3c3e625a484?hp=--cc

Merge branch 'master' into openstreetbugs
---

8980da4381923d8099a11a1334baf3c3e625a484
diff --cc app/views/site/index.html.erb
index 305df63c0,0a0b7c1da..70402a1c9
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@@ -19,10 -19,12 +19,13 @@@
  <div id="map">
  </div>
  
+ <iframe id="linkloader" style="display: none">
+ </iframe>
+ 
  <div id="permalink">
    <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
 -  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
 +  <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
 +  <a href="/" id="ReportBug">Report a problem</a>	
  </div>
  
  <div id="attribution">