merged develop

This commit is contained in:
TomPallister
2017-02-11 12:07:08 +00:00
34 changed files with 674 additions and 295 deletions

6
.gitignore vendored
View File

@ -236,3 +236,9 @@ _Pvt_Extensions
# FAKE - F# Make
.fake/
tools/
# MacOS
.DS_Store
# Ocelot acceptance test config
test/Ocelot.AcceptanceTests/configuration.json