spec/spec_helper.rb · 8b50c96b1b548263404f0449b8694dab0da08d70 · open-source / annotate · GitLab

Blame History Permalink

Merge remote branch 'smtlaissezfaire/master' into restart · 10f896ee
fistfvck authored Jun 20, 2010
```
Conflicts:
	lib/annotate/annotate_models.rb
	spec/annotate/annotate_models_spec.rb
```
10f896ee

spec_helper.rb 100 Bytes