release v0.16.0

brendensoares · brendensoares · commit 82f20b40b667 · 2017-06-06T21:40:13.000-07:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 A high productivity, full-stack web framework for the [Go language](http://www.golang.org).
 
-Current Version: 0.16.0-dev (2017-05-11)
+Current Version: 0.16.0 (2017-06-06)
 
 **As of Revel 0.15.0, Go 1.7+ is required.**
 
diff --git a/README.md.orig b/README.md.orig
@@ -0,0 +1,59 @@
+# Revel Framework
+
+[![Build Status](https://secure.travis-ci.org/revel/revel.svg?branch=master)](http://travis-ci.org/revel/revel)  [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
+A high productivity, full-stack web framework for the [Go language](http://www.golang.org).
+
+<<<<<<< HEAD
+Current Version: 0.16.0-dev (2017-05-11)
+=======
+Current Version: 0.15.0 (2017-05-11)
+>>>>>>> master
+
+**As of Revel 0.15.0, Go 1.7+ is required.**
+
+## Quick Start
+
+Install revel framework:
+
+	go get -u github.com/revel/cmd/revel
+
+Create a new app and run it:
+
+	revel new github.com/myaccount/my-app
+	revel run github.com/myaccount/my-app
+
+Open http://localhost:9000 in your browser and you should see "It works!"
+
+
+## Community
+
+* [Gitter](https://gitter.im/revel/community)
+* [StackOverflow](http://stackoverflow.com/questions/tagged/revel)
+
+## Learn More
+
+* [Manual, Samples, Godocs, etc](http://revel.github.io)
+* [Apps using Revel](https://github.com/revel/revel/wiki/Apps-in-the-Wild)
+* [Articles Featuring Revel](https://github.com/revel/revel/wiki/Articles)
+
+## Contributing
+
+* [Contributing Code Guidelines](https://github.com/revel/revel/blob/master/CONTRIBUTING.md)
+* [Revel Contributors](https://github.com/revel/revel/graphs/contributors)
+
+
+## Gratitude
+
+First and foremost, we'd like to thank the growing community of developers who enjoy using and contributing to Revel. Your patience, feedback, and moral support are vital to the ongoing development of Revel!
+
+Finally, we'd like to thank the professional organizations that have supported the development of Revel:
+* [Looking Glass](https://www.lookingglasscyber.com/)
+
+
+## Announcements
+
+View the [v0.15.0 release notes](https://github.com/revel/revel/releases/tag/v0.15.0)
+for all of the relevant changes.
+
+We are working on increasing the speed and quality of our releases. Your feedback has never been so valuable, please share your thoughts with us and help shape Revel!
diff --git a/version.go b/version.go
@@ -6,10 +6,10 @@ package revel
 
 const (
 	// Version current Revel version
-	Version = "0.16.0-dev"
+	Version = "0.16.0"
 
 	// BuildDate latest commit/release date
-	BuildDate = "2017-05-11"
+	BuildDate = "2017-06-06"
 
 	// MinimumGoVersion minimum required Go version for Revel
 	MinimumGoVersion = ">= go1.7"
diff --git a/version.go.orig b/version.go.orig
@@ -0,0 +1,20 @@
+// Copyright (c) 2012-2017 The Revel Framework Authors, All rights reserved.
+// Revel Framework source code and usage is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package revel
+
+const (
+	// Version current Revel version
+<<<<<<< HEAD
+	Version = "0.16.0-dev"
+=======
+	Version = "0.15.0"
+>>>>>>> master
+
+	// BuildDate latest commit/release date
+	BuildDate = "2017-05-11"
+
+	// MinimumGoVersion minimum required Go version for Revel
+	MinimumGoVersion = ">= go1.7"
+)
