app/controllers/people_controller.rb · 3ed10a22ffb7e2771260cf6c6f8320c5892f0fce · facil / parlote-facil · GitLab

nov. 04, 2010
1bba4c60
Merge remote branch 'MrZYX/untranslated-strings' · 1bba4c60
Raphael a rédigé nov. 04, 2010
```
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
```
1bba4c60
Merge remote branch 'MrZYX/untranslated-strings'
Raphael a rédigé nov. 04, 2010
```
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
```