Commit graph

14 commits

Author SHA1 Message Date
Tom Naessens 07966e550d Fix merge conflict code 2014-12-09 21:28:19 +01:00
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
ohsab 3ddead7943 layout 2014-12-09 21:25:34 +01:00
Tom Naessens 2d0885b057 Decent title 2014-12-09 21:03:37 +01:00
Tom Naessens 86fc009c3f Merge branch 'master' of github.com:ZeusWPI/Tab
Conflicts:
	app/assets/stylesheets/application.css.scss
2014-12-09 20:45:53 +01:00
Tom Naessens dc6d0b5d21 Fix the whole devise and admins and everythings 2014-12-09 20:34:50 +01:00
ohsab f247e6c5ff dagschotel button added 2014-12-09 20:26:18 +01:00
ohsab 00dcd98a93 overview view mooi gemaakt 2014-12-09 19:44:48 +01:00
Tom Naessens 1a50fb5cf2 Make things a lot more beautiful 2014-12-09 14:39:27 +01:00
ohsab db37c694aa color btn 2014-12-09 13:10:36 +01:00
ohsab b064cb21ef knopjes 2014-12-09 12:08:49 +01:00
ohsab 98b4759758 new overview 2014-12-09 12:01:25 +01:00
ohsab 26cb04dd33 overview button 2014-12-09 11:38:10 +01:00
Benjamin Cousaert 95aaca802f Fix view of orders/new 2014-12-04 17:02:08 +01:00
Renamed from app/assets/stylesheets/application.css (Browse further)