Merge pull request #595 from samvera-labs/1.2.0

Release 1.2.0
samvera · Aug 29, 2018 · 1d01eb4 · 1d01eb4
2 parents 1beedc6 + 36d1fad
commit 1d01eb4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.2.0 2018-08-29
+
+## Changes since last release
+
+* Added `optimistic_locking_enabled?` to ChangeSets.
+
 # v1.2.0.RC3 2018-08-15
 
 ## Changes since last release

diff --git a/lib/valkyrie/version.rb b/lib/valkyrie/version.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "1.2.0.rc3"
+  VERSION = "1.2.0"
 end