diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 19:41:05 -0800 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 19:41:05 -0800 |
commit | 8763b78f8949f904dd0b53017555451b83f06884 (patch) | |
tree | 9768fa21b17fd236ad83c0ae69cb5cad4f22d1d2 /actionpack/lib/abstract_controller/rendering.rb | |
parent | 3506cb730b89dee8a5067329b5aac707708426db (diff) | |
parent | 15f95621d5b472959215cdc258491934e5f05f2e (diff) | |
download | rails-8763b78f8949f904dd0b53017555451b83f06884.tar.gz rails-8763b78f8949f904dd0b53017555451b83f06884.tar.bz2 rails-8763b78f8949f904dd0b53017555451b83f06884.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 8ef2526df0..f4e1580977 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -16,7 +16,6 @@ module AbstractController include AbstractController::Logger included do - attr_internal :formats extlib_inheritable_accessor :_view_paths self._view_paths ||= ActionView::PathSet.new end |