Commit 5198f1c2 by Jon Frisby

Merge remote-tracking branch 'melriffe/master'

Conflicts: lib/annotate/annotate_models.rb spec/annotate/annotate_models_spec.rb
parents fd43f23d 8f1fe151
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment