Merge branch '5.2' into 5.3

This commit is contained in:
Robbie Averill 2019-01-08 10:22:14 +01:00
commit dd23966be3

View File

@ -21,8 +21,8 @@ SilverStripe\ORM\DatabaseAdmin:
EditableOption: SilverStripe\UserForms\Model\EditableFormField\EditableOption
EditableRadioField: SilverStripe\UserForms\Model\EditableFormField\EditableRadioField
EditableTextField: SilverStripe\UserForms\Model\EditableFormField\EditableTextField
EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient
EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition
UserDefinedForm_EmailRecipient: SilverStripe\UserForms\Model\Recipient\EmailRecipient
UserDefinedForm_EmailRecipientCondition: SilverStripe\UserForms\Model\Recipient\EmailRecipientCondition
SubmittedFileField: SilverStripe\UserForms\Model\Submission\SubmittedFileField
SubmittedForm: SilverStripe\UserForms\Model\Submission\SubmittedForm
SubmittedFormField: SilverStripe\UserForms\Model\Submission\SubmittedFormField