Merge remote-tracking branch 'origin/1.5.x' into fix-template-enum-seperation
# Conflicts: # app/config/specs/open-api3-latest-console.json # app/config/specs/swagger2-latest-console.json
This commit is contained in:
commit
f2efe9ca72
6 changed files with 11 additions and 5 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
|||
Subproject commit 01aa032daef600cc5e07f4be5019c2fbf8f3420b
|
||||
Subproject commit 0a007a3b1b6eafc39dc19b7129f41643102f9676
|
|
@ -334,6 +334,12 @@ abstract class Format
|
|||
return 'MessagingProviderType';
|
||||
}
|
||||
break;
|
||||
case 'createSHAUser':
|
||||
switch ($param) {
|
||||
case 'passwordVersion':
|
||||
return 'PasswordHash';
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue