spec/models/user_spec.rb · db11b9d2140cf73a11cf1a0ae9bc2cade93a18e9 · facil / parlote-facil · GitLab

sept. 12, 2012
358ed79f
Merge branch 'update_devise' · 358ed79f
Jonne Haß a rédigé sept. 12, 2012
```
Conflicts:
	Gemfile.lock
```
358ed79f
Merge branch 'update_devise'
Jonne Haß a rédigé sept. 12, 2012
```
Conflicts:
	Gemfile.lock
```