From 8691b90e34056d6f6452f4e19fb867f430935c40 Mon Sep 17 00:00:00 2001
From: Zach Mullen <zach.mullen@kitware.com>
Date: Thu, 15 Jan 2015 17:02:50 -0500
Subject: [PATCH] Version to 1.2.0

---
 docs/conf.py | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index fdae906476..3839e37320 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -82,9 +82,9 @@ def __getattr__(cls, name):
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.2.0'
 # The short X.Y version.
-version = '1.1'
+version = '1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/package.json b/package.json
index 9f0d35e493..fba5da651c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "girder",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "High-performance data management platform",
   "homepage": "https://girder.readthedocs.org",
   "bugs": {