tracks/app/assets/images
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
..
favicon.ico add navigation to application layout 2013-06-22 13:48:06 +02:00
next.png add missing images 2014-05-16 14:33:18 +02:00
previous.png add missing images 2014-05-16 14:33:18 +02:00
tracks-logo-dark.png migrate login page 2013-06-21 10:18:02 +02:00