842f63b080
Conflicts: lib/rabl-rails.rb test/renderers/json_renderer_test.rb |
||
---|---|---|
.. | ||
renderers | ||
cache_templates_test.rb | ||
compiler_test.rb | ||
deep_nesting_test.rb | ||
non_restful_response_test.rb | ||
render_test.rb | ||
test_helper.rb |
842f63b080
Conflicts: lib/rabl-rails.rb test/renderers/json_renderer_test.rb |
||
---|---|---|
.. | ||
renderers | ||
cache_templates_test.rb | ||
compiler_test.rb | ||
deep_nesting_test.rb | ||
non_restful_response_test.rb | ||
render_test.rb | ||
test_helper.rb |