Merge branch 'release/1.2.0-rc1' into develop

.goxc.json

@@ -6,7 +6,8 @@
 	"Arch": "amd64",
 	"Os": "darwin freebsd linux windows",
 	"ResourcesInclude": "README*,LICENSE*,CHANGELOG*,inbucket.bat,etc,themes",
-	"PackageVersion": "1.1.0",
+	"PackageVersion": "1.2.0",
+	"PrereleaseInfo": "rc1",
 	"ConfigVersion": "0.9",
 	"BuildSettings": {
 		"LdFlagsXVars": {

CHANGELOG.md

@@ -4,8 +4,8 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-[Unreleased]
+[1.2.0-rc1] - 2017-01-29
-------------
+------------------------
 
 ### Added
 - Storage of `To:` header in messages (likely breaks existing datastores)
@@ -76,6 +76,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   specific message.
 
 [Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop
+[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
 [1.1.0-rc2]:  https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...1.1.0-rc2
 [1.1.0-rc1]:  https://github.com/jhillyerd/inbucket/compare/1.0...1.1.0-rc1

inbucket.go

@@ -24,7 +24,7 @@ import (
 
 var (
 	// VERSION contains the build version number, populated during linking by goxc
-	VERSION = "1.1.0"
+	VERSION = "1.2.0-rc1"
 
 	// BUILDDATE contains the build date, populated during linking by goxc
 	BUILDDATE = "undefined"