85f3d956f5
Conflicts: app/views/layouts/application.html.haml |
||
---|---|---|
.. | ||
asc.png | ||
bg.png | ||
desc.png | ||
style.scss |
85f3d956f5
Conflicts: app/views/layouts/application.html.haml |
||
---|---|---|
.. | ||
asc.png | ||
bg.png | ||
desc.png | ||
style.scss |