From 4c53b0ed9e9c0cdb8c607e34d180ccf7df549708 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@monax.io>
Date: Thu, 3 Nov 2016 14:49:05 +0100
Subject: [PATCH] git: merge master to sync up commits

---
 version/version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version/version.go b/version/version.go
index d285dbec..1ea89d48 100644
--- a/version/version.go
+++ b/version/version.go
@@ -129,4 +129,4 @@ func (version *VersionIdentifier) MatchesMinorVersion(
 
 // IMPORTANT: Eris-DB version must be on the last line of this file for
 // the deployment script tests/build_tool.sh to pick up the right label.
-const VERSION = "0.12.0-rc3"
+const VERSION = "0.12.0-develop"
-- 
GitLab