Commit 2ff1d370 by Jon Frisby

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

Conflicts: Rakefile VERSION.yml lib/annotate/annotate_models.rb
parents 43520d82 db0cbf84
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