Merge branch 'dev'

2011-10-28 12:33:07 +03:00 · 2011-10-28 12:33:07 +03:00 · ae47d69281
commit ae47d69281
parent fb40d27d1e 3fa770dd10
147 changed files with 1773 additions and 1631 deletions
--- a/app/views/projects/empty.html.erb
+++ b/app/views/projects/empty.html.erb
@ -40,7 +40,7 @@ eos
      <p>
      Be careful! <br/>
      Project cant be recovered after destroy.</p>
-      <%= link_to 'Destroy', @project, 
+      <%= link_to 'Destroy', @project,
      :confirm => 'Are you sure?', :method => :delete,
      :class => "left button negative span-6", :style => "text-align:center" %>
      <div class="clear"></div>