MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/delete-multiple-button-action

This commit is contained in:
Dean 2023-07-14 09:11:48 +01:00
parent a481eee39e 840ff66239
commit 06e516ee70
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.8.10-alpha.0", "version": "2.8.10-alpha.1",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

2
packages/server/src/integrations/microsoftSqlServer.ts
View File

@ -63,7 +63,7 @@ interface NTLMMSSQLConfig extends BasicMSSQLConfig {
} }
type MSSQLConfig = type MSSQLConfig =
| (BasicMSSQLConfig & { authType: undefined }) | (BasicMSSQLConfig & { authType?: undefined })
| AzureADMSSQLConfig | AzureADMSSQLConfig
| NTLMMSSQLConfig | NTLMMSSQLConfig