Merge branch 'release/2.0.0'

CHANGELOG.md

@@ -4,7 +4,13 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.0.0-rc1] - 2018-04-07
+## [v2.0.0] - 2018-05-05
+
+### Changed
+- Corrected docs for INBUCKET_STORAGE_PARAMS (thanks evilmrburns.)
+- Disabled color log output on Windows, doesn't work there.
+
+## [v2.0.0-rc1] - 2018-04-07
 
 ### Added
 - Inbucket is now configured using environment variables instead of a config
@@ -154,6 +160,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   specific message.
 
 [Unreleased]:  https://github.com/jhillyerd/inbucket/compare/master...develop
+[v2.0.0]:  https://github.com/jhillyerd/inbucket/compare/v2.0.0-rc1...v2.0.0
 [v2.0.0-rc1]:  https://github.com/jhillyerd/inbucket/compare/v1.3.1...v2.0.0-rc1
 [v1.3.1]:      https://github.com/jhillyerd/inbucket/compare/v1.3.0...v1.3.1
 [v1.3.0]:      https://github.com/jhillyerd/inbucket/compare/v1.2.0...v1.3.0

cmd/inbucket/main.go

@@ -181,7 +181,7 @@ func openLog(level string, logfile string, json bool) (close func(), err error)
 	}
 	close = func() {}
 	var w io.Writer
-	color := true
+	color := runtime.GOOS != "windows"
 	switch logfile {
 	case "stderr":
 		w = os.Stderr