Merge branch 'master' into develop

public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.typoscript

@@ -7,8 +7,3 @@ plugin.tx_form.view {
 plugin.tx_form.settings.yamlConfigurations {
     100 = EXT:ep_theme/Configuration/Forms/FormSetup.yaml
 }
-
-module.tx_form.settings.yamlConfigurations {
-    100 = EXT:ep_theme/Configuration/Forms/FormSetup.yaml
-}
-

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html

@@ -65,7 +65,7 @@
                         <div class="form-group" :class="{ 'has-error': formErrors.pax }">
                             <label for="pax" class="control-label">Anzahl der Personen</label>
                             <f:form.textfield class="form-control" property="pax"
-                                              placeholder="ab 15 Personen"/>
+                                              placeholder="ab 25 Personen"/>
                             <div class="help-block"
                                  v-show="formErrors.pax" v-html="formErrors.pax"></div>
                         </div>