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
..
application.js	Merge branch 'master' into new-gui	2014-06-26 10:46:20 +02:00
disable_fx_in_test.js.erb	Speed up feature tests by disabling jQuery effects	2014-06-10 14:59:28 -04:00
keybindings.js.coffee	* Add details popover to action.	2013-08-09 22:49:57 +02:00
tracks.js.coffee.erb	fix path error in js and update gems	2014-03-28 10:28:20 +01:00
tracks.old.js	Merge branch 'master' into new-gui	2014-06-26 10:46:20 +02:00