From 75aeec50e08fd29dd68d8f83f8a1c465e62e5910 Mon Sep 17 00:00:00 2001
From: Grayson Wright <wright.grayson@gmail.com>
Date: Wed, 9 Dec 2015 15:20:11 -0500
Subject: [PATCH] Add a changelog entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d490c429fb..5d70adb434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 * [#251] [FEATURE] Raise a helpful error when an attribute is missing from
   `ATTRIBUTE_TYPES`
 * [#298] [FEATURE] Support ActiveRecord model I18n translations
+* [#312] [FEATURE] Add a `nil` option to `has_many` form fields
 * [#231] [UI] Fix layout issue on show page where a long label next to an empty
   value would cause following fields on the page to be mis-aligned.
 * [#309] [UI] Fix layout issue in datetime pickers where months and years