Add changelog.

rails-api · Oct 2, 2015 · fae14da · fae14da
1 parent c180ab8
commit fae14da
Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Breaking changes:
 
 Features:
 
+- [#1193](https://github.com/rails-api/active_model_serializers/pull/1193) Add support for inline nested serializers (@beauby)
 - [#1172](https://github.com/rails-api/active_model_serializers/pull/1172) Better serializer registration, get more than just the first module (@bf4)
 - [#1158](https://github.com/rails-api/active_model_serializers/pull/1158) Add support for wildcards in `include` option (@beauby)
 - [#1127](https://github.com/rails-api/active_model_serializers/pull/1127) Add support for nested

diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb
@@ -1,4 +1,3 @@
-# 2420012eliyel - popincool - 22 cite popincourt - 4e premiere droite
 module ActiveModel
   class Serializer
     # Defines an association in the object should be rendered.