Commit 075c125e by Jon Frisby

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

Conflicts: lib/annotate/annotate_models.rb
parents ab20ee5b 277f1713
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