Commit c69f08df by Jon Frisby

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

Conflicts: Rakefile annotate.gemspec lib/annotate/annotate_models.rb spec/annotate/annotate_models_spec.rb todo.txt
parents 4f02f272 30907402
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