Merge branch 'create-default-serializer' into HEAD

Conflicts:
	lib/active_model/array_serializer.rb
This commit is contained in:
Adam Stanton
2013-03-05 21:48:58 -08:00
3 changed files with 18 additions and 2 deletions

View File

@@ -51,5 +51,4 @@ class ArraySerializerTest < ActiveModel::TestCase
{ :title => "Post2" }
], serializer.as_json)
end
end