Add CHANGELOG entry

heartcombo · Jul 20, 2016 · e2faeef · e2faeef
1 parent 9493948
commit e2faeef
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,16 @@
+<<<<<<< 92f7c499ef7301f0c800980053a183f117f7b16a
 ## Unreleased
 
 * Add the `aria-invalid` attribute on inputs with errors.
 
 ## 3.2.1
 
-* Updated gem dependency to support Rails 5.0.x.
+### enhancements
+  * Updated gem dependency to support Rails 5.0.x.
+
+### bug fix
+  * Fix `merge_wrapper_options` to correctly merge options with duplicated keys. [@herminiotorres](https://github.com/herminiotorres)
+  Closes [#1278](https://github.com/plataformatec/simple_form/issues/1278).
 
 ## 3.2.0