Commit 4f02f272 by Jon Frisby

Merge remote-tracking branch 'branch14/master' into development

Conflicts: Rakefile VERSION.yml annotate.gemspec lib/annotate/annotate_models.rb
parents 55984c28 e51c3418
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