diff --git a/.goxc.json b/.goxc.json index b78010a..78f24d2 100644 --- a/.goxc.json +++ b/.goxc.json @@ -7,7 +7,6 @@ "Os": "darwin freebsd linux windows", "ResourcesInclude": "README*,LICENSE*,CHANGELOG*,inbucket.bat,etc,themes", "PackageVersion": "1.2.0", - "PrereleaseInfo": "rc2", "ConfigVersion": "0.9", "BuildSettings": { "LdFlagsXVars": { @@ -15,4 +14,4 @@ "Version": "main.VERSION" } } -} \ No newline at end of file +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f2972f..d50e215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +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/). +[1.2.0] - 2017-12-27 +-------------------- + +### Changed + +- No significant code changes from rc2 + [1.2.0-rc2] - 2017-12-15 ------------------------ @@ -92,6 +99,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). specific message. [Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop +[1.2.0]: https://github.com/jhillyerd/inbucket/compare/1.2.0-rc2...1.2.0 [1.2.0-rc2]: https://github.com/jhillyerd/inbucket/compare/1.2.0-rc1...1.2.0-rc2 [1.2.0-rc1]: https://github.com/jhillyerd/inbucket/compare/1.1.0...1.2.0-rc1 [1.1.0]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc2...1.1.0 diff --git a/inbucket.go b/inbucket.go index 59a22b2..eea845f 100644 --- a/inbucket.go +++ b/inbucket.go @@ -24,7 +24,7 @@ import ( var ( // version contains the build version number, populated during linking - version = "1.2.0-rc2" + version = "1.2.0" // date contains the build date, populated during linking date = "undefined"