Merge branch 'master' of github.com:diaspora/diaspora
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 1 ajout, 0 suppression.gitignore
- README.md 10 ajouts, 6 suppressionsREADME.md
- app/controllers/aspects_controller.rb 1 ajout, 1 suppressionapp/controllers/aspects_controller.rb
- app/controllers/photos_controller.rb 2 ajouts, 1 suppressionapp/controllers/photos_controller.rb
- app/controllers/publics_controller.rb 6 ajouts, 0 suppressionapp/controllers/publics_controller.rb
- app/controllers/users_controller.rb 2 ajouts, 2 suppressionsapp/controllers/users_controller.rb
- app/models/person.rb 1 ajout, 1 suppressionapp/models/person.rb
- app/models/status_message.rb 7 ajouts, 6 suppressionsapp/models/status_message.rb
- app/models/user.rb 9 ajouts, 3 suppressionsapp/models/user.rb
- app/views/publics/hcard.erb 6 ajouts, 0 suppressionapp/views/publics/hcard.erb
- app/views/publics/webfinger.erb 3 ajouts, 0 suppressionapp/views/publics/webfinger.erb
- app/views/shared/_aspect_friends.haml 5 ajouts, 5 suppressionsapp/views/shared/_aspect_friends.haml
- app/views/users/_profile.haml 1 ajout, 1 suppressionapp/views/users/_profile.haml
- app/views/users/_services.haml 13 ajouts, 12 suppressionsapp/views/users/_services.haml
- config/deploy.rb 6 ajouts, 1 suppressionconfig/deploy.rb
- config/deploy_config.yml 1 ajout, 1 suppressionconfig/deploy_config.yml
- config/environment.rb 11 ajouts, 7 suppressionsconfig/environment.rb
- config/fb_config.yml.example 4 ajouts, 0 suppressionconfig/fb_config.yml.example
- config/locales/devise/devise.he.yml 1 ajout, 1 suppressionconfig/locales/devise/devise.he.yml
- config/locales/diaspora/en.yml 1 ajout, 0 suppressionconfig/locales/diaspora/en.yml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter