Yannick 2507ab6080 Fix merge issues

2020-04-09 20:30:37 +02:00

..

assets

Experiment with colors

2020-04-09 19:15:00 +02:00

channels/application_cable

Hello tinyforms

2020-04-05 23:35:53 +02:00

controllers

Merge pull request #9 from bumi/setup-application-layout

2020-04-09 18:29:48 +02:00

helpers

Hello tinyforms

2020-04-05 23:35:53 +02:00

javascript

Move burger menu file to its own file

2020-04-09 18:37:36 +02:00

jobs

Always try to append the data to the spreadsheet

2020-04-09 18:29:56 +02:00

mailers

Hello tinyforms

2020-04-05 23:35:53 +02:00

models

That should not be there

2020-04-09 13:39:04 +02:00

views

Fix merge issues

2020-04-09 20:30:37 +02:00