-
Merge remote-tracking branch 'appsinyourpants/master' into development · b58a4f71Jon Frisby authored
Conflicts: .gitignore Gemfile Gemfile.lock README.rdoc Rakefile VERSION.yml annotate.gemspec bin/annotate_models lib/annotate.rb lib/annotate/annotate_routes.rb lib/tasks/annotate_models.rake lib/tasks/annotate_routes.rake spec/annotate_models_spec.rb spec/spec_helper.rb
b58a4f71
This project manages its dependencies using
Bundler.
Learn more
×