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
..
renderers	Merge branch 'master' into condition-blocks	2012-10-05 14:08:45 +02:00
cache_templates_test.rb	Better methods naming	2012-07-15 17:56:11 +02:00
compiler_test.rb	Merge branch 'master' into condition-blocks	2012-10-05 14:08:45 +02:00
deep_nesting_test.rb	Replace Struct by Class to avoid stubbing respond_to?	2012-09-12 01:33:04 +02:00
non_restful_response_test.rb	Use MultiJson in test also	2012-07-24 12:13:01 +02:00
render_test.rb	Locals are now passed to the renderer object.	2012-09-13 15:57:05 +02:00
test_helper.rb	Add XML engine configuration	2012-09-17 15:24:39 +02:00