Merge

2014-03-18 21:30:12 +01:00 · 2014-03-18 21:30:12 +01:00 · 3af9bad30e
commit 3af9bad30e
parent 2ccd37a7af
92 changed files with 2089 additions and 10693 deletions
--- a/app/views/admin/events/show.html.haml
+++ b/app/views/admin/events/show.html.haml
@ -8,7 +8,7 @@
    #proposal-content.tab-pane.active
      = render 'proposal'
    #history-content.tab-pane
-      .span12
+      .col-md-12
        %table.table
          %thead
            %th