ohsab 5d2859ae61 Merge branch 'master' of https://github.com/ZeusWPI/Tab ... Conflicts: app/assets/stylesheets/application.css.scss		2014-12-09 21:26:19 +01:00
..
_order.html.erb	Move logic to model	2014-12-08 11:41:38 +01:00
_user_list.html.erb	layout	2014-12-09 21:25:34 +01:00
new.html.erb	Add total price to order form	2014-12-09 09:43:21 +01:00
overview.html.erb	Fix login flashes on the overview	2014-12-09 21:15:24 +01:00