Merge branch '5.0' into 5.1

This commit is contained in:
Robbie Averill 2018-05-30 11:10:16 +12:00
commit a8c939d8da

View File

@ -3,8 +3,6 @@ en:
SELECTUPLOADFOLDER: 'Select upload folder' SELECTUPLOADFOLDER: 'Select upload folder'
SilverStripe\CMS\Model\SiteTree: SilverStripe\CMS\Model\SiteTree:
TABMAIN: Main TABMAIN: Main
SilverStripe\Forms\Form:
FIELDISREQUIRED: '{name} is required.'
SilverStripe\UserForms: SilverStripe\UserForms:
ADDEMAILRECIPIENT: 'Add Email Recipient' ADDEMAILRECIPIENT: 'Add Email Recipient'
CLEARBUTTON: Clear CLEARBUTTON: Clear