1
0
Fork 0
mirror of synced 2024-10-03 02:37:40 +13:00

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:
Jake Barnby 2024-02-12 15:03:51 +13:00
commit f2efe9ca72
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
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

View file

@ -334,6 +334,12 @@ abstract class Format
return 'MessagingProviderType';
}
break;
case 'createSHAUser':
switch ($param) {
case 'passwordVersion':
return 'PasswordHash';
}
break;
}
break;
}