Merge branch 'refs/heads/assets-refactoring' into dev
This commit is contained in:
commit
00613d0d50
15 changed files with 16 additions and 17 deletions
|
@ -7,7 +7,6 @@
|
|||
= stylesheet_link_tag 'blueprint/print', :media => "print"
|
||||
= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
|
||||
= stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
|
||||
= stylesheet_link_tag 'jquery_ui/jquery-ui-1.8.16.custom', :media => "screen, projection"
|
||||
= stylesheet_link_tag "application"
|
||||
= javascript_include_tag "application"
|
||||
= csrf_meta_tags
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue