Gemfile · 98cdee97c062da6b48bec237e32c175542535ae5 · facil / parlote-facil · GitLab

fév. 24, 2011
98cdee97
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections · 98cdee97
MrZYX a rédigé fév. 24, 2011
```
Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/publics_controller.rb
```
98cdee97
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections
MrZYX a rédigé fév. 24, 2011
```
Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/publics_controller.rb
```

Les dépendances de ce projet sont gérées grâce à Bundler. En savoir plus