Merge remote branch 'ui/ui' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Fri, 14 Jan 2011 06:04:33 +0000 (01:04 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Fri, 14 Jan 2011 06:04:33 +0000 (01:04 -0500)
commit9cb8bebdee08e68a41cbaef5df1ebc1b625ea81c
tree50b2cfb65bd59181e20761cf9ca9344ad4ded937
parent72931aca757c6f6f5ae214b043ebeed2bdcb6a12
parent72324454432c72506cc480ef31268a61c1f84cae
Merge remote branch 'ui/ui' into next
app/stylesheets/app/_basics.sass
app/views/questions/show.html.haml