Commit graph

2 commits

Author SHA1 Message Date
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
Reinier Balt
a380799d74 remove old assets and archive layout files 2013-06-21 09:02:25 +02:00
Renamed from app/assets/javascripts/tracks.js (Browse further)