Tleilaxu b9e5c63a9a Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons ... Conflicts: app/assets/stylesheets/orders.css.scss		2015-02-19 18:13:35 +01:00
..
_order_item.html.erb	fix some css	2015-02-19 18:07:34 +01:00
_total_price.html.erb	Fixed css	2015-02-19 18:08:50 +01:00