a4c8e8eff8
Conflicts: Gemfile app/assets/stylesheets/design/custom.scss app/controllers/projects/projects_controller.rb |
||
---|---|---|
.. | ||
common.scss | ||
custom.scss | ||
git.scss | ||
main.scss |
a4c8e8eff8
Conflicts: Gemfile app/assets/stylesheets/design/custom.scss app/controllers/projects/projects_controller.rb |
||
---|---|---|
.. | ||
common.scss | ||
custom.scss | ||
git.scss | ||
main.scss |