spec · efe98369fc8b391a7e75ce9a9f3b0c0ac5ac2771 · open-source / annotate · GitLab

History Find file

Merge remote branch 'adamico/master' into restart · efe98369
fistfvck authored Jun 20, 2010
```
Conflicts:
	annotate.gemspec
	spec/annotate/annotate_models_spec.rb
```
efe98369

Name	Last commit	Last update
..
annotate		Loading commit data...
annotate_spec.rb		Loading commit data...
spec.opts		Loading commit data...
spec_helper.rb		Loading commit data...