Beatrice Olivera ed238f3f7e Merge branch 'master' into working-version		2018-08-31 21:44:53 +01:00
..
assets	Merge branch 'master' into working-version	2018-08-31 21:44:53 +01:00
channels	added chatroom channel with room ids and notifications channel	2018-08-30 03:00:09 +01:00
controllers	Merge branch 'master' into working-version	2018-08-31 21:44:53 +01:00
helpers	done demo checklist	2018-08-31 15:32:14 +02:00
javascript	minor updates to clean up code	2018-08-31 21:38:48 +01:00
jobs	Initial commit with devise template from https://github.com/lewagon/rails-templates	2018-08-27 15:37:06 +01:00
mailers	Initial commit with devise template from https://github.com/lewagon/rails-templates	2018-08-27 15:37:06 +01:00
models	Merge branch 'master' into page	2018-08-30 20:09:00 +01:00
uploaders	done page	2018-08-29 16:58:21 +01:00
views	Merge branch 'master' into working-version	2018-08-31 21:44:53 +01:00