Merge branch 'master' into openid

[rails.git] / app / views / trace / view.html.erb

diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index c1d5e044570f1b1b197fa62e284f3a69525cb3db..73638cb3d917da56649a77be0bd504b807746f4e 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -15,7 +15,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.view.uploaded' %></td>
   </tr> 
   <tr>
     <td><%= t'trace.view.uploaded' %></td>

-    <td><%= l @trace.timestamp %></td>
+    <td><%= l @trace.timestamp, :format => :friendly %></td>

   </tr>
   <% if @trace.inserted? %>
   <tr>
   </tr>
   <% if @trace.inserted? %>
   <tr>