-
- Téléchargements
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts: app/views/comments/_comment.html.haml app/views/layouts/application.html.haml
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/models/post.rb 1 ajout, 0 suppressionapp/models/post.rb
- app/models/status_message.rb 1 ajout, 1 suppressionapp/models/status_message.rb
- app/views/blogs/_blog.html.haml 1 ajout, 1 suppressionapp/views/blogs/_blog.html.haml
- app/views/bookmarks/_bookmark.html.haml 1 ajout, 1 suppressionapp/views/bookmarks/_bookmark.html.haml
- app/views/comments/_comment.html.haml 1 ajout, 1 suppressionapp/views/comments/_comment.html.haml
- app/views/layouts/application.html.haml 6 ajouts, 12 suppressionsapp/views/layouts/application.html.haml
- app/views/status_messages/_status_message.html.haml 1 ajout, 1 suppressionapp/views/status_messages/_status_message.html.haml
- config/initializers/socket.rb 7 ajouts, 5 suppressionsconfig/initializers/socket.rb
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter