spec/spec_helper.rb · 9389d99ba86d89ebae6c07e36a1b2b0700573990 · facil / parlote-facil · GitLab

oct. 29, 2010
15bd24a6
Merge branch 'master' of github.com:diaspora/diaspora · 15bd24a6
maxwell a rédigé oct. 29, 2010
```
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
```
15bd24a6
Merge branch 'master' of github.com:diaspora/diaspora
maxwell a rédigé oct. 29, 2010
```
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
```