![]() Conflicts: Gemfile.lock public/scripts/app.js public/scripts/min/app.js public/styles/app.css public/version |
||
---|---|---|
.. | ||
images | ||
scripts | ||
styles | ||
stylesheets | ||
colors.html | ||
favicon.ico | ||
index.html | ||
version |
![]() Conflicts: Gemfile.lock public/scripts/app.js public/scripts/min/app.js public/styles/app.css public/version |
||
---|---|---|
.. | ||
images | ||
scripts | ||
styles | ||
stylesheets | ||
colors.html | ||
favicon.ico | ||
index.html | ||
version |