Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
Conflicts: app/views/albums/show.html.haml app/views/authors/show.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/views/albums/index.html.haml 2 ajouts, 2 suppressionsapp/views/albums/index.html.haml
- app/views/albums/show.html.haml 1 ajout, 0 suppressionapp/views/albums/show.html.haml
- app/views/layouts/application.html.haml 8 ajouts, 12 suppressionsapp/views/layouts/application.html.haml
- app/views/photos/show.html.haml 3 ajouts, 2 suppressionsapp/views/photos/show.html.haml
- app/views/shared/_group_nav.haml 14 ajouts, 0 suppressionapp/views/shared/_group_nav.haml
- app/views/status_messages/_status_message.html.haml 1 ajout, 1 suppressionapp/views/status_messages/_status_message.html.haml
- public/javascripts/group_nav.js 16 ajouts, 0 suppressionpublic/javascripts/group_nav.js
- public/javascripts/view.js 4 ajouts, 9 suppressionspublic/javascripts/view.js
- public/stylesheets/application.css 50 ajouts, 15 suppressionspublic/stylesheets/application.css
- public/stylesheets/sass/application.sass 59 ajouts, 14 suppressionspublic/stylesheets/sass/application.sass
- public/stylesheets/sass/ui.sass 28 ajouts, 24 suppressionspublic/stylesheets/sass/ui.sass
- public/stylesheets/ui.css 26 ajouts, 25 suppressionspublic/stylesheets/ui.css
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter