Beatrice Olivera b62908598e Solve conflict		2018-08-31 12:17:16 +01:00
..
assets	Solve conflict	2018-08-31 12:17:16 +01:00
channels	added chatroom channel with room ids and notifications channel	2018-08-30 03:00:09 +01:00
controllers	fixed calling modal	2018-08-31 11:29:24 +01:00
helpers	Initial commit with devise template from https://github.com/lewagon/rails-templates	2018-08-27 15:37:06 +01:00
javascript	fixed issue where modal trigger broke navbar	2018-08-31 12:00:17 +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	Solve conflict	2018-08-31 12:17:16 +01:00