Commit graph

4 commits

Author SHA1 Message Date
Tom Naessens 2eee65ccf8 Merge branch 'master' of github.com:ZeusWPI/Tab
Conflicts:
	app/assets/stylesheets/orders.css.scss
2014-12-09 22:50:43 +01:00
Tom Naessens b7a97f4753 Heights heights heights 2014-12-09 22:49:35 +01:00
ohsab 6c51972248 footer layout 2014-12-09 22:36:24 +01:00
MatsMyncke af6f2668e6 logout 2014-11-06 18:56:00 +01:00