Benjamin Cousaert 0d94b3e383 Merge		2014-12-09 20:29:37 +01:00
..
assets	dagschotel button added	2014-12-09 20:26:18 +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 https://github.com/ZeusWPI/Tab	2014-12-09 17:07:22 +01:00
mailers	basis dingen	2014-11-06 14:46:59 +01:00
models	Merge	2014-12-09 20:29:37 +01:00
views	dagschotel button added	2014-12-09 20:26:18 +01:00