diff --git a/CHANGELOG.md b/CHANGELOG.md index 68645c0d..e2f56f3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Master (unreleased) +## 1.2.1 [☰](https://github.com/activeadmin/arbre/compare/v1.2.0...v1.2.1) + * Revert [#64][] to fix several regressions, at the cost of reintroducing [#46][]. [#121][] by [@deivid-rodriguez][] ## 1.2.0 [☰](https://github.com/activeadmin/arbre/compare/v1.2.0.rc1...v1.2.0) diff --git a/Gemfile.lock b/Gemfile.lock index 83002f74..5f8e2980 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - arbre (1.2.0) + arbre (1.2.1) activesupport (>= 3.0.0) GEM diff --git a/lib/arbre/version.rb b/lib/arbre/version.rb index bced7ca7..896464cf 100644 --- a/lib/arbre/version.rb +++ b/lib/arbre/version.rb @@ -1,3 +1,3 @@ module Arbre - VERSION = "1.2.0" + VERSION = "1.2.1" end