Merge branch 'master' into openid

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

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index 523607ae63b660094bcd930dbe92a175b261b105..202f9039d573b5a81ed954818c91f2af6ee40941 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -11,7 +11,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.edit.uploaded_at' %></td>
-    <td><%= l @trace.timestamp %></td>
+    <td><%= l @trace.timestamp, :format => :friendly %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>