Download as
Browse Code »

Commit 9bc8cc2ace02559fdd4cdf9839a2d39149b06de5

Authored by Rodrigo Souto
2 parents ec227289 4b06d2fb
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'rails3'

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/views/layouts/_javascript.html.erb
  Diff comments   View file @9bc8cc2
1   -<%= javascript_include_tag 'jquery-2.1.1.min', 'jquery-migrate-1.2.1',
2   -'prototype.js', 'effects.js', 'dragdrop.js', 'controls.js',
  1 +<%= javascript_include_tag 'prototype.js', 'effects.js', 'dragdrop.js', 'controls.js',
  2 +'jquery-2.1.1.min', 'jquery-migrate-1.2.1',
3 3 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
4 4 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
5 5 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
... ...