Merge branch 'master' into normalize_capitalization

2012-09-06 11:40:56 +03:00 · 2012-09-06 11:40:56 +03:00 · 562af7a6a2
commit 562af7a6a2
parent a65ce74843 e4447de23f
30 changed files with 236 additions and 171 deletions
--- a/app/views/keys/show.html.haml
+++ b/app/views/keys/show.html.haml
@ -10,5 +10,5 @@
 %hr

 %pre= @key.key
-.actions
+.right
  = link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn danger delete-key"