tracks/app/views/layouts
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.html.erb First-pass conversion of layouts and icons to BS3/FA 2014-03-29 16:59:18 -04:00
application.old.html.erb remove old assets and archive layout files 2013-06-21 09:02:25 +02:00
login.html.erb First-pass conversion of layouts and icons to BS3/FA 2014-03-29 16:59:18 -04:00
login.old.html.erb remove old assets and archive layout files 2013-06-21 09:02:25 +02:00
mobile.m.erb Add mobile calendar view 2014-04-21 12:55:13 -04:00