Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- .gitignore 4 ajouts, 0 suppression.gitignore
- COPYRIGHT 3 ajouts, 3 suppressionsCOPYRIGHT
- Capfile 0 ajout, 2 suppressionsCapfile
- Gemfile 7 ajouts, 10 suppressionsGemfile
- Gemfile.lock 37 ajouts, 25 suppressionsGemfile.lock
- README.md 5 ajouts, 280 suppressionsREADME.md
- Rakefile 1 ajout, 2 suppressionsRakefile
- app/controllers/albums_controller.rb 4 ajouts, 4 suppressionsapp/controllers/albums_controller.rb
- app/controllers/application_controller.rb 0 ajout, 1 suppressionapp/controllers/application_controller.rb
- app/controllers/aspects_controller.rb 14 ajouts, 11 suppressionsapp/controllers/aspects_controller.rb
- app/controllers/comments_controller.rb 1 ajout, 2 suppressionsapp/controllers/comments_controller.rb
- app/controllers/dev_utilities_controller.rb 9 ajouts, 10 suppressionsapp/controllers/dev_utilities_controller.rb
- app/controllers/people_controller.rb 0 ajout, 1 suppressionapp/controllers/people_controller.rb
- app/controllers/photos_controller.rb 14 ajouts, 12 suppressionsapp/controllers/photos_controller.rb
- app/controllers/publics_controller.rb 2 ajouts, 3 suppressionsapp/controllers/publics_controller.rb
- app/controllers/registrations_controller.rb 1 ajout, 1 suppressionapp/controllers/registrations_controller.rb
- app/controllers/requests_controller.rb 8 ajouts, 8 suppressionsapp/controllers/requests_controller.rb
- app/controllers/sockets_controller.rb 0 ajout, 1 suppressionapp/controllers/sockets_controller.rb
- app/controllers/status_messages_controller.rb 0 ajout, 1 suppressionapp/controllers/status_messages_controller.rb
- app/controllers/users_controller.rb 7 ajouts, 3 suppressionsapp/controllers/users_controller.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter