Tom Naessens 07966e550d Fix merge conflict code		2014-12-09 21:28:19 +01:00
..
assets	Fix merge conflict code	2014-12-09 21:28:19 +01:00
controllers	Remove email from Devise users and use nickname as primary key	2014-12-09 18:56:56 +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	Merge	2014-12-09 20:29:37 +01:00
views	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2014-12-09 21:26:19 +01:00