Merge branch 'redesign' of github.com:osmlab/openstreetmap-website into redesign
authorAaron Lidman <aaronlidman@gmail.com>
Tue, 5 Nov 2013 21:31:50 +0000 (13:31 -0800)
committerAaron Lidman <aaronlidman@gmail.com>
Tue, 5 Nov 2013 21:31:50 +0000 (13:31 -0800)
commitbc27347b8f8333b65962b8c00f76dc99a1095a8a
tree859206c2218f8f5bd9e2f714e24bb4e2a6abb2b9
parent684e7db45afda7f26074343a111196aa7b51a093
parent0f799186abfb97b2d3b056f9bc76996a87aa6fd8
Merge branch 'redesign' of github.com:osmlab/openstreetmap-website into redesign
app/assets/stylesheets/common.css.scss