Merge branch 'master' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 29 Jun 2011 00:35:47 +0000 (19:35 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Wed, 29 Jun 2011 00:35:47 +0000 (19:35 -0500)
commit6588dde1ac14b98230852e00542ed4c4c1f3cb60
treebf32166a0d87a2d39bc26abf7b78f1bd67342dc4
parent1a4943514780691eec539cdaba250818e5c9ff92
parent7c7cf430b4d09e834cb3a175e4e57a9a5cb922e6
Merge branch 'master' into next

Conflicts:
app/controllers/answers_controller.rb
app/controllers/application_controller.rb
app/controllers/questions_controller.rb
app/controllers/users_controller.rb
app/models/export.rb
app/models/question.rb
app/models/user.rb
app/stylesheets/application.sass
app/views/comments/_comment.html.haml
app/views/members/_form.html.haml
app/views/notifier/favorited.html.haml
app/views/notifier/follow.html.haml
app/views/shared/_dlvr_link.html.haml
app/views/users/show.html.haml
config/boot.rb
config/environment.rb
config/initializers/01_locales.rb
config/initializers/mongo.rb
config/locales/welcome/en.yml
lib/tasks/fixdb.rake
public/javascripts/application.js
script/export
script/import
script/server
15 files changed:
app/old-stylesheets/_mixins.sass
app/old-stylesheets/_rounded.sass
app/old-stylesheets/errors.sass
app/old-stylesheets/themes/bec-green/style.sass
app/old-stylesheets/themes/blue/style.sass
app/old-stylesheets/themes/drastic-bec/style.sass
app/old-stylesheets/themes/green/style.sass
app/old-stylesheets/themes/plain/style.sass
app/old-stylesheets/themes/shapado/style.sass
app/old-stylesheets/themes/sof/style.sass
app/views/notifier/earned_badge.html.haml
app/views/notifier/earned_badge.text.haml
app/views/notifier/favorited.text.haml
app/views/notifier/follow.text.haml
lib/tasks/setup.rake