Beatrice Olivera b62908598e Solve conflict		2018-08-31 12:17:16 +01:00
..
config	Initial commit with devise template from https://github.com/lewagon/rails-templates	2018-08-27 15:37:06 +01:00
images	added favicon	2018-08-31 11:58:20 +02:00
javascripts	fixed issue where modal trigger broke navbar	2018-08-31 12:00:17 +01:00
stylesheets	Merge pull request #27 from beatriceo/contacts	2018-08-31 12:05:37 +01:00