tracks/app/views/shared
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
..
_add_new_action.html.erb First-pass conversion of layouts and icons to BS3/FA 2014-03-29 16:59:18 -04:00
_add_new_item_form.html.erb home page renders... sort of 2012-04-30 13:56:35 +02:00
_flash.html.erb First-pass conversion of layouts and icons to BS3/FA 2014-03-29 16:59:18 -04:00
_flash.m.erb Fix visible HTML tags in mobile flash 2012-10-25 21:24:04 -04:00
_footer.html.erb Merge branch 'master' into new-gui 2014-06-26 10:46:20 +02:00
_footer.m.erb Move mobile full-site link to footer 2014-04-21 12:55:03 -04:00
_goto.html.erb First-pass conversion of layouts and icons to BS3/FA 2014-03-29 16:59:18 -04:00
_keyboard_shortcuts.html.erb * Add details popover to action. 2013-08-09 22:49:57 +02:00
_navbar.html.erb First-pass conversion of layouts and icons to BS3/FA 2014-03-29 16:59:18 -04:00