Merge branch 'master' into bootstrap

2013-01-21 17:33:29 -05:00
parent b93efcf15b b83721ed56
commit c75da12d94
8 changed files with 38 additions and 221 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,9 +2,9 @@
 <html>
  <head>
    <title><%= content_for?(:title) ? yield(:title) : (t :name) %></title>
-    <%= stylesheet_link_tag "application", "forum-monster" %>
+    <%= stylesheet_link_tag :application %>
    <%= csrf_meta_tag %>
-    <%= javascript_include_tag(:application) %>
+    <%= javascript_include_tag :application %>
    <%= yield(:head) %>
  </head>
  <body>