Merge branch 'master' into dev

This commit is contained in:
Charles Nurse 2021-03-02 12:14:41 -08:00
commit a4f0afa0ab
2 changed files with 4 additions and 0 deletions

2
.gitignore vendored
View File

@ -8,6 +8,8 @@ msbuild.binlog
*.binlog
*.nupkg
*.idea
Oqtane.Server/appsettings.json
Oqtane.Server/Data/*.mdf
Oqtane.Server/Data/*.ldf

View File

@ -16,6 +16,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{77EECA8C-B58E-469E-B8C5-D543AFC9A654}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitignore = .gitignore
README.md = README.md
EndProjectSection
EndProject
Global