Merge branch 'master' of github.com:jrhe/grape-active_model_serializers

Browse source

Conflicts:
	lib/grape-active_model_serializers/formatter.rb

...

This commit is contained in:

jrhe 2013-04-10 19:40:14 +01:00

parent 517731792b 3b67bd5393

commit 94efb988f5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available