Commit 46df45d5 by Jon Frisby

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

Conflicts: annotate_models.gemspec bin/annotate lib/annotate/annotate_models.rb lib/tasks/annotate.rake
parents f2a6c320 63d5a109
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