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