Commit 4f8a0be6 by Jon Frisby

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

Conflicts: lib/annotate_models.rb
parents 3c29b0ac 78dc09ca
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