Commit 18da6a78 by Jon Frisby

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

Conflicts: lib/annotate/annotate_models.rb
parents 5829e243 1d8e273f
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