diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-11-15 19:16:58 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-11-15 19:16:58 +0000 |
| commit | 153d7ca630d10449f24f5576f27452f9efb40791 (patch) | |
| tree | b6a8fa0639a6fc275c5809ea9ba7d268954b1709 /actionview | |
| parent | 69f72223e82a4a4f16f16ad7abb36ebfd162a366 (diff) | |
| parent | 905226fc262861201d843d622a803ed1aeaebaa8 (diff) | |
| download | rails-153d7ca630d10449f24f5576f27452f9efb40791.tar.gz rails-153d7ca630d10449f24f5576f27452f9efb40791.tar.bz2 rails-153d7ca630d10449f24f5576f27452f9efb40791.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/renderer/renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/renderer/renderer.rb b/actionview/lib/action_view/renderer/renderer.rb index 1bee35d80d..2a3b89aebf 100644 --- a/actionview/lib/action_view/renderer/renderer.rb +++ b/actionview/lib/action_view/renderer/renderer.rb @@ -15,7 +15,7 @@ module ActionView @lookup_context = lookup_context end - # Main render entry point shared by AV and AC. + # Main render entry point shared by Action View and Action Controller. def render(context, options) if options.key?(:partial) render_partial(context, options) |