Merge branch 'master' into next

* master: Bump to version 2.0.0.
hainesr · Jun 27, 2014 · 642b78e · 642b78e
2 parents ce5ba97 + b32efb6
commit 642b78e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/version.yml b/version.yml
@@ -1,4 +1,4 @@
 ---
-  :major: 1
-  :minor: 1
+  :major: 2
+  :minor: 0
   :patch: 0