Merge branch 'release/version'

alex-held · Feb 1, 2020 · f875b00 · f875b00
2 parents f6ad24c + 5a58183
commit f875b00
Show file tree

Hide file tree

Showing 203 changed files with 6,933 additions and 2,708 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,5 @@
-# Auto detect text files that will always have CRLF line endings on checkout.
-* text eol=crlf
+# Auto detect text files that will always have LF line endings on checkout.
+* text=auto eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary

diff --git a/.gitignore b/.gitignore
@@ -264,6 +264,8 @@ paket-files/
 
 # JetBrains Rider
 .idea/
+**/.idea/contentModel.xml
+**/.idea/workspaceModel.xml
 *.sln.iml
 
 # CodeRush
@@ -284,3 +286,6 @@ TestResults.xml
 stryker-config.json
 **/Stryker*/*.*
 **/.DS_Store
+
+!.idea/
+/.idea/
diff --git a/.idea/.idea.NinjaTools.FluentMockServer/.idea/.gitignore b/.idea/.idea.NinjaTools.FluentMockServer/.idea/.gitignore
diff --git a/.idea/.idea.NinjaTools.FluentMockServer/.idea/GitScope.xml b/.idea/.idea.NinjaTools.FluentMockServer/.idea/GitScope.xml
diff --git a/.idea/.idea.NinjaTools.FluentMockServer/.idea/bashsupport_project.xml b/.idea/.idea.NinjaTools.FluentMockServer/.idea/bashsupport_project.xml
diff --git a/.idea/.idea.NinjaTools.FluentMockServer/.idea/codeStyles/Project.xml b/.idea/.idea.NinjaTools.FluentMockServer/.idea/codeStyles/Project.xml
diff --git a/.idea/.idea.NinjaTools.FluentMockServer/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.NinjaTools.FluentMockServer/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/.idea.NinjaTools.FluentMockServer/.idea/codestream.xml b/.idea/.idea.NinjaTools.FluentMockServer/.idea/codestream.xml
diff --git a/.idea/.idea.NinjaTools.FluentMockServer/.idea/compiler.xml b/.idea/.idea.NinjaTools.FluentMockServer/.idea/compiler.xml