tracks/app/assets/javascripts/application.js
Reinier Balt 59291f305f Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/helpers/todos_helper.rb
	app/views/shared/_footer.html.erb
2014-06-26 10:46:20 +02:00

34 lines
No EOL
1.1 KiB
JavaScript

// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
//
//= require jquery
//= require jquery_ujs
//= require bootstrap
//= require mousetrap
//
// Stuff in vendor/assets
// require jquery-ui-1.10.0.custom.min
// require jquery.ui.touch-punch.min
// require jquery.blockUI
// require jquery.form
// require jquery.jeditable.mini
// require jquery.simulate.drag-sortable
// require jquery.truncator
//
//= require typeahead
//= require jquery.cookie
//= require swf_fu
//
// Stuff in app/assets
//= require tracks.js
//= require disable_fx_in_test
//= require keybindings.js