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
- spec/models/user_spec.rb 11 ajouts, 5 suppressionsspec/models/user_spec.rb
- spec/spec_helper.rb 8 ajouts, 4 suppressionsspec/spec_helper.rb
- spec/user_encryption_spec.rb 15 ajouts, 23 suppressionsspec/user_encryption_spec.rb
- test/performance/browsing_test.rb 0 ajout, 15 suppressionstest/performance/browsing_test.rb
- test/selenium/login_test.rb 0 ajout, 13 suppressionstest/selenium/login_test.rb
- test/selenium/selenium_suite.rb 0 ajout, 17 suppressionstest/selenium/selenium_suite.rb
- test/test_helper.rb 0 ajout, 19 suppressionstest/test_helper.rb
- ubuntu-setup.bash 45 ajouts, 19 suppressionsubuntu-setup.bash
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter