tracks/app/assets
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
..
images Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
javascripts Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
stylesheets First-pass conversion of layouts and icons to BS3/FA 2014-03-29 16:59:18 -04:00
swfs add swf to asset pipeline. Fixes #1311 2012-07-16 17:38:44 +02:00