Merge branch 'release/v1.1.1'

custom-dev-tools · Aug 24, 2020 · a32a0ed · a32a0ed
2 parents a323d0d + 3345f4f
commit a32a0ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Ensure these specific files always have a CRLF line ending.
+*.bat text eol=crlf
+*.ini text eol=crlf
+*.txt text eol=crlf
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - Add config option for HTTP/2 per domain.
 
+## [1.1.1] - 2020-08-25
+
+### Fixed
+- Added .gitattributes file to normalize EOL's for Windows OS when code is downloaded as ZIP file.
+
+### Changed
+- Updated version number.
+
 ## [1.1.0] - 2020-06-22
 
 ### Added

diff --git a/ssl_config.bat b/ssl_config.bat
@@ -7,7 +7,7 @@ rem     INITIALISATION
 rem -----------------------
 rem  Set default variables
 rem -----------------------
-set $scriptVersion=1.1.0
+set $scriptVersion=1.1.1
 set $scriptLogFileName=ssl_config.log
 
 rem WampServer sub-paths.