Commit fc6b727c by Jon Frisby

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

Conflicts: Rakefile VERSION.yml annotate.gemspec lib/tasks/annotate_models.rake
parents 2ff1d370 7d4f2152
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