Merge remote-tracking branch 'origin/master'

8b6d6536 · Clint Mourlevat · a4686026 · 62797a82 · 8b6d6536 · a4686026
Commit 8b6d6536 authored Oct 19, 2018 by Clint Mourlevat
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 17 deletions

.gitattributes .gitattributes +6 -0

appsettings.Development.json appsettings.Development.json +0 -9

appsettings.json appsettings.json +0 -8

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+wwwroot/css/bootstrap.min.css linguist-vendored
+wwwroot/css/default.css linguist-vendored
+wwwroot/css/font-awesome.min.css linguist-vendored
+wwwroot/css/landing.css linguist-vendored
+wwwroot/css/owl.carousel.min.css linguist-vendored
+wwwroot/css/owl.theme.default.min.css linguist-vendored
--- a/appsettings.Development.json
+++ b/appsettings.Development.json
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
-    }
-  }
-}
--- a/appsettings.json
+++ b/appsettings.json
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}