Merge branch 'features/452_fichiers_cube'
Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less app/controllers/vpn_services_controller.rb features/step_definitions/services.rb
Affichage de
- app/assets/stylesheets/bootstrap_and_overrides.css.less 6 ajouts, 0 suppressionapp/assets/stylesheets/bootstrap_and_overrides.css.less
- app/controllers/vpn_services_controller.rb 18 ajouts, 1 suppressionapp/controllers/vpn_services_controller.rb
- app/models/ability.rb 1 ajout, 1 suppressionapp/models/ability.rb
- app/views/vpn_services/cube.erb 32 ajouts, 0 suppressionapp/views/vpn_services/cube.erb
- app/views/vpn_services/show.html.erb 7 ajouts, 0 suppressionapp/views/vpn_services/show.html.erb
- config/locales/fr.yml 1 ajout, 0 suppressionconfig/locales/fr.yml
- config/routes.rb 1 ajout, 0 suppressionconfig/routes.rb
- features/administration/abonnement/consultation_des_details_techniques_dun_abonnement.feature 21 ajouts, 0 suppression...onsultation_des_details_techniques_dun_abonnement.feature
- features/membre/consultation_des_details_techniques_dun_abonnement.feature 21 ajouts, 0 suppression...onsultation_des_details_techniques_dun_abonnement.feature
- features/step_definitions/services.rb 18 ajouts, 1 suppressionfeatures/step_definitions/services.rb
- public/images/download-circle.png 0 ajout, 0 suppressionpublic/images/download-circle.png
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter