Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora...
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" This reverts commit 2ac54eef, reversing changes made to 3a136570.
parent
c2ad1705
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/controllers/users_controller.rb 0 ajout, 8 suppressionsapp/controllers/users_controller.rb
- app/models/user.rb 1 ajout, 1 suppressionapp/models/user.rb
- app/views/users/edit.html.haml 2 ajouts, 6 suppressionsapp/views/users/edit.html.haml
- config/locales/diaspora/en.yml 0 ajout, 3 suppressionsconfig/locales/diaspora/en.yml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter