6c8c1ca880
Conflicts: app/assets/stylesheets/design/custom.scss |
||
---|---|---|
.. | ||
design | ||
devise | ||
application.scss | ||
login.scss | ||
reg_session.scss | ||
tour.scss |
6c8c1ca880
Conflicts: app/assets/stylesheets/design/custom.scss |
||
---|---|---|
.. | ||
design | ||
devise | ||
application.scss | ||
login.scss | ||
reg_session.scss | ||
tour.scss |