-
- Téléchargements
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts: app/views/layouts/application.html.haml app/views/status_messages/_status_message.html.haml
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/controllers/dashboard_controller.rb 1 ajout, 1 suppressionapp/controllers/dashboard_controller.rb
- app/helpers/application_helper.rb 12 ajouts, 11 suppressionsapp/helpers/application_helper.rb
- app/models/post.rb 0 ajout, 4 suppressionsapp/models/post.rb
- app/views/comments/_comments.html.haml 6 ajouts, 0 suppressionapp/views/comments/_comments.html.haml
- app/views/comments/_new_comment.html.haml 1 ajout, 2 suppressionsapp/views/comments/_new_comment.html.haml
- app/views/layouts/application.html.haml 1 ajout, 2 suppressionsapp/views/layouts/application.html.haml
- app/views/status_messages/_status_message.html.haml 1 ajout, 6 suppressionsapp/views/status_messages/_status_message.html.haml
- lib/common.rb 1 ajout, 1 suppressionlib/common.rb
- lib/message_handler.rb 1 ajout, 1 suppressionlib/message_handler.rb
- public/javascripts/socket.js 0 ajout, 14 suppressionspublic/javascripts/socket.js
- public/stylesheets/application.css 6 ajouts, 6 suppressionspublic/stylesheets/application.css
- public/stylesheets/sass/application.sass 5 ajouts, 7 suppressionspublic/stylesheets/sass/application.sass
- spec/factories.rb 2 ajouts, 0 suppressionspec/factories.rb
- spec/helpers/parser_spec.rb 24 ajouts, 8 suppressionsspec/helpers/parser_spec.rb
- spec/lib/common_spec.rb 2 ajouts, 2 suppressionsspec/lib/common_spec.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter