10b828c644
Conflicts: db/schema.rb vendor/assets/javascripts/vendor.js |
||
---|---|---|
.. | ||
design | ||
devise | ||
application.scss | ||
login.scss | ||
reg_session.scss | ||
tour.scss |
10b828c644
Conflicts: db/schema.rb vendor/assets/javascripts/vendor.js |
||
---|---|---|
.. | ||
design | ||
devise | ||
application.scss | ||
login.scss | ||
reg_session.scss | ||
tour.scss |