-
- Téléchargements
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
- app/models/retraction.rb 0 ajout, 1 suppressionapp/models/retraction.rb
- app/models/status_message.rb 0 ajout, 2 suppressionsapp/models/status_message.rb
- app/models/user.rb 30 ajouts, 26 suppressionsapp/models/user.rb
- app/uploaders/image_uploader.rb 0 ajout, 1 suppressionapp/uploaders/image_uploader.rb
- app/views/albums/_album.html.haml 2 ajouts, 2 suppressionsapp/views/albums/_album.html.haml
- app/views/albums/_new_album.haml 2 ajouts, 3 suppressionsapp/views/albums/_new_album.haml
- app/views/albums/edit.html.haml 4 ajouts, 5 suppressionsapp/views/albums/edit.html.haml
- app/views/albums/index.html.haml 3 ajouts, 4 suppressionsapp/views/albums/index.html.haml
- app/views/albums/show.html.haml 5 ajouts, 9 suppressionsapp/views/albums/show.html.haml
- app/views/aspects/_new_aspect.haml 1 ajout, 2 suppressionsapp/views/aspects/_new_aspect.haml
- app/views/aspects/index.html.haml 1 ajout, 3 suppressionsapp/views/aspects/index.html.haml
- app/views/aspects/manage.html.haml 9 ajouts, 14 suppressionsapp/views/aspects/manage.html.haml
- app/views/aspects/show.html.haml 1 ajout, 2 suppressionsapp/views/aspects/show.html.haml
- app/views/comments/_comment.html.haml 1 ajout, 2 suppressionsapp/views/comments/_comment.html.haml
- app/views/comments/_comments.html.haml 1 ajout, 2 suppressionsapp/views/comments/_comments.html.haml
- app/views/comments/_new_comment.html.haml 0 ajout, 1 suppressionapp/views/comments/_new_comment.html.haml
- app/views/devise/sessions/new.html.haml 3 ajouts, 3 suppressionsapp/views/devise/sessions/new.html.haml
- app/views/js/_websocket_js.haml 9 ajouts, 12 suppressionsapp/views/js/_websocket_js.haml
- app/views/layouts/application.html.haml 7 ajouts, 8 suppressionsapp/views/layouts/application.html.haml
- app/views/layouts/session_wall.html.haml 5 ajouts, 6 suppressionsapp/views/layouts/session_wall.html.haml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter