Add CHANGELOG entry

heartcombo · Oct 8, 2015 · 9d4e5cd · 9d4e5cd
1 parent 71ae2cb
commit 9d4e5cd
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## master
+
+### 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
 
 ### bug fix