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
..
rabl-rails	Merge branch 'master' into condition-blocks	2012-10-05 14:08:45 +02:00
tasks	rabl-fast-json => rabl-rails	2012-04-20 16:28:34 +02:00
rabl-rails.rb	Merge branch 'master' into condition-blocks	2012-10-05 14:08:45 +02:00