Permalink
Browse files

Merge branch 'master' into devtools

Conflicts:
	Gemfile
  • Loading branch information...
dkubb committed Jan 19, 2013
2 parents c7b9ca0 + b9fdf82 commit cd84b5a398217133e03b711f10c92e0bbfa227ba
Showing with 3 additions and 2 deletions.
  1. +3 −2 lib/abstract_type.rb
View
@@ -8,15 +8,16 @@ module AbstractType
# @param [Module] descendant
# the module or class including AbstractType
#
# @return [self]
# @return [undefined]
#
# @api private
def self.included(descendant)
super
descendant.extend(ClassMethods)
self
end
private_class_method :included
module ClassMethods
# Instantiate a new object

0 comments on commit cd84b5a

Please sign in to comment.