a4c8e8eff8
Conflicts: Gemfile app/assets/stylesheets/design/custom.scss app/controllers/projects/projects_controller.rb |
||
---|---|---|
.. | ||
design | ||
devise | ||
application.scss | ||
login.scss | ||
reg_session.scss | ||
tour.scss |