From b5eccd67dc9769d580ef03934d73c63b1735b259 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Sun, 12 Oct 2014 19:35:05 -0300
Subject: [PATCH] Update changelog [ci skip]

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ebfbb97..052202d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## master (unreleased)
+
+### enhancements
+  * Update foundation generator to version 5. [@jorge-d](https://github.com/jorge-d)
+
+### bug fix
+  * Fix `full_error` when the attribute is an association. [@mvdamme](https://github.com/jorge-d)
+
 ## 3.1.0.rc2
 
 ### enhancements