Merge branch 'master' into mobile

2026-08-26 21:27:16 -05:00 · 2013-09-05 15:54:22 -04:00
parent dc1efd6c78 c2f37d36ab
commit 45d7765936
133 changed files with 2458 additions and 1264 deletions
@@ -15,12 +15,6 @@
  })();
 </script>

-<%# load the selected locale before any other scripts %>
-<%= javascript_include_tag "locales/#{I18n.locale}" %>
-<%= javascript_include_tag "application" %>
-<%- if staff? %>
-  <%= javascript_include_tag "admin"%>
-<%- end %>

 <script>
  Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host  %>';