Merge branch 'master' of github.com:diaspora/diaspora
Conflicts: config/routes.rb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 9 ajouts, 10 suppressions.gitignore
- README.md 5 ajouts, 2 suppressionsREADME.md
- app/controllers/aspects_controller.rb 6 ajouts, 6 suppressionsapp/controllers/aspects_controller.rb
- app/controllers/publics_controller.rb 1 ajout, 1 suppressionapp/controllers/publics_controller.rb
- app/controllers/status_messages_controller.rb 3 ajouts, 3 suppressionsapp/controllers/status_messages_controller.rb
- app/controllers/users_controller.rb 3 ajouts, 3 suppressionsapp/controllers/users_controller.rb
- app/models/fb_status.rb 4 ajouts, 4 suppressionsapp/models/fb_status.rb
- app/models/user.rb 2 ajouts, 2 suppressionsapp/models/user.rb
- app/views/aspects/public.html.haml 1 ajout, 1 suppressionapp/views/aspects/public.html.haml
- app/views/shared/_aspect_friends.haml 2 ajouts, 2 suppressionsapp/views/shared/_aspect_friends.haml
- app/views/users/_services.haml 1 ajout, 1 suppressionapp/views/users/_services.haml
- app/views/users/edit.html.haml 1 ajout, 1 suppressionapp/views/users/edit.html.haml
- config/deploy.rb 1 ajout, 1 suppressionconfig/deploy.rb
- config/deploy_config.yml 3 ajouts, 3 suppressionsconfig/deploy_config.yml
- config/initializers/_mongo.rb 4 ajouts, 7 suppressionsconfig/initializers/_mongo.rb
- config/locales/devise/devise.ar.yml 40 ajouts, 0 suppressionconfig/locales/devise/devise.ar.yml
- config/locales/devise/devise.nb.yml 40 ajouts, 0 suppressionconfig/locales/devise/devise.nb.yml
- config/locales/diaspora/ar.yml 206 ajouts, 0 suppressionconfig/locales/diaspora/ar.yml
- config/locales/diaspora/cs.yml 1 ajout, 1 suppressionconfig/locales/diaspora/cs.yml
- config/locales/diaspora/he.yml 1 ajout, 1 suppressionconfig/locales/diaspora/he.yml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter