071c391a6e
Conflicts: app/assets/stylesheets/design/custom.scss |
||
---|---|---|
.. | ||
design | ||
devise | ||
application.scss | ||
login.scss | ||
reg_session.scss |
071c391a6e
Conflicts: app/assets/stylesheets/design/custom.scss |
||
---|---|---|
.. | ||
design | ||
devise | ||
application.scss | ||
login.scss | ||
reg_session.scss |