42b5e7a73f
Conflicts: app/views/pages/all.html.haml public/stylesheets/main.css public/stylesheets/print.css |
||
---|---|---|
.. | ||
sass | ||
foodsoft.css | ||
ie_hacks.css | ||
main.css | ||
nav.css | ||
print.css | ||
rails_messages.css | ||
scaffold.css |
42b5e7a73f
Conflicts: app/views/pages/all.html.haml public/stylesheets/main.css public/stylesheets/print.css |
||
---|---|---|
.. | ||
sass | ||
foodsoft.css | ||
ie_hacks.css | ||
main.css | ||
nav.css | ||
print.css | ||
rails_messages.css | ||
scaffold.css |