Files · b58a4f712f2c1a0527ff4d2f86cf1bb90486df81 · open-source / annotate

Merge remote-tracking branch 'appsinyourpants/master' into development · b58a4f71

authored Mar 01, 2012

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

Name	Last commit	Last update
bin		Loading commit data...
lib		Loading commit data...
spec		Loading commit data...
tasks		Loading commit data...
.gitignore		Loading commit data...
.rvmrc		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		Loading commit data...
History.txt		Loading commit data...
README.rdoc		Loading commit data...
Rakefile		Loading commit data...
VERSION.yml		Loading commit data...
annotate.gemspec		Loading commit data...
todo.txt		Loading commit data...

README.rdoc