tap/app
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
..
assets Merge branch 'master' of github.com:ZeusWPI/Tab 2014-12-09 22:50:43 +01:00
controllers Add avatar to users 2014-12-09 22:32:54 +01:00
helpers Merge branch 'master' of github.com:ZeusWPI/Tab 2014-12-09 20:45:53 +01:00
mailers basis dingen 2014-11-06 14:46:59 +01:00
models Add avatar to users 2014-12-09 22:32:54 +01:00
views footer layout 2014-12-09 22:36:24 +01:00