ccocchi 842f63b080 Merge branch 'master' into condition-blocks ... Conflicts: lib/rabl-rails.rb test/renderers/json_renderer_test.rb		2012-10-05 14:08:45 +02:00
..
json_renderer_test.rb	Merge branch 'master' into condition-blocks	2012-10-05 14:08:45 +02:00
xml_renderer_test.rb	Add tests for XML renderers	2012-09-17 15:08:28 +02:00