Merge commit '42265cdda4ea03541522bf5cf5d104059927393f' into dev

# Conflicts:
#	Oqtane.Server/Infrastructure/DatabaseManager.cs
This commit is contained in:
Charles Nurse
2021-05-24 15:40:35 -07:00
14 changed files with 132 additions and 157 deletions

View File

@ -20,7 +20,7 @@ namespace Oqtane.Controllers
Name = "LocalDB",
FriendlyName = "Local Database",
ControlType = "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client",
DBType = "Oqtane.Database.SqlServer.LocalDbDatabase, Oqtane.Database.SqlServer",
DBType = "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer",
Package = "Oqtane.Database.SqlServer"
},
new()