custom.scss
2.43 KB
-
Merge branch 'Task/13_ID15_ID14_ID16' into 'master' · a06436f1
# Conflicts: # Gemfile.lock # app/assets/stylesheets/custom.scss # app/controllers/application_controller.rb # app/controllers/applies_controller.rb # app/javascript/packs/application.js # app/views/layouts/_header.html.slim
Mai Hoang Thai Ha committed