Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 17 Oct 2010 10:02:11 +0000 (11:02 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 17 Oct 2010 10:02:11 +0000 (11:02 +0100)
Conflicts:
app/views/site/index.html.erb

1  2 
app/views/site/index.html.erb
config/locales/en.yml
config/routes.rb

  </noscript>
  
  <div id="map">
-   <div id="permalink">
-     <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
-     <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
-       <a id="ReportBug">Report a problem</a>  
-   </div>
- </div> 
+ </div>
+ <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">
    <table width="100%">
Simple merge
Simple merge