Merge branch 'master' of https://github.com/serilog/serilog-settings-appsettings into dev

nblumhardt · nblumhardt · commit 589b56c88692 · 2016-08-17T11:06:36.000+10:00
# Conflicts:
#	Build.ps1
diff --git a/.gitignore b/.gitignore
@@ -234,3 +234,4 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
+*.orig
diff --git a/appveyor.yml b/appveyor.yml
@@ -27,3 +27,4 @@ deploy:
   tag: v$(appveyor_build_version)
   on:
     branch: master
+    
