-conflits resolve

This commit is contained in:
Emile NDAGIJIMANA 2021-06-14 15:11:21 +02:00
parent 688ef08cd5
commit 080fcb9c62
141 changed files with 4856 additions and 931 deletions

View file

@ -46,6 +46,10 @@ Settings.attachSchema(
type: String,
optional: false,
},
spinnerName: {
type: String,
optional: true,
},
hideLogo: {
type: Boolean,
optional: true,