Commit f5c1aa0f by Jon Frisby

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

Conflicts: annotate.gemspec lib/annotate.rb lib/annotate/annotate_models.rb lib/tasks/annotate_models.rake lib/tasks/annotate_routes.rake
parents 56e6930e 7dba7cbb
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