Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-06 09:18:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/helpers/todos_helper.rb
	app/views/shared/_footer.html.erb
This commit is contained in:
Reinier Balt 2014-06-26 10:46:20 +02:00
commit 59291f305f
170 changed files with 629 additions and 882 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/application.js
View file

@ -12,9 +12,7 @@
//
//= require jquery
//= require jquery_ujs
//
//= require bootstrap
//
//= require mousetrap
//
// Stuff in vendor/assets
@ -32,4 +30,5 @@
//
// Stuff in app/assets
//= require tracks.js
//= require keybindings.js
//= require disable_fx_in_test
//= require keybindings.js