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
..
application	Added flashes to products	2014-12-09 14:42:50 +01:00
devise	Fix the whole devise and admins and everythings	2014-12-09 20:34:50 +01:00
layouts	Better link names	2014-12-09 21:25:27 +01:00
order_products	Aub tom	2014-12-09 19:25:49 +01:00
orders	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2014-12-09 21:26:19 +01:00
products	Added flashes to products	2014-12-09 14:42:50 +01:00
users	Remove views from user, because devise	2014-12-09 17:22:40 +01:00