Thilo Billerbeck f91f917dbe Merge branch 'master' into 'thilo-fixes' ... # Conflicts: # src/components/Question.vue # src/views/HelpPage.vue # src/views/Warning.vue		2020-03-22 14:26:51 +01:00
..
HelpPage.vue	Merge branch 'master' into 'thilo-fixes'	2020-03-22 14:26:51 +01:00
Home.vue	Created a button-wrapper div to center buttons	2020-03-22 13:06:42 +01:00
Questionnaire.vue	Merge branch 'master' into 'thilo-fixes'	2020-03-22 14:26:51 +01:00
Results.vue	added conditional rendering of text blocks in Results	2020-03-22 13:43:57 +01:00
Warning.vue	Merge branch 'master' into 'thilo-fixes'	2020-03-22 14:26:51 +01:00