danielvincent 7f795e05cb Merge branch 'master' into half-decent ... Conflicts: app/controllers/dashboard_controller.rb		2010-06-21 14:25:22 -07:00
..
controllers	Merge branch 'master' into half-decent	2010-06-21 14:25:22 -07:00
helpers	added dumb partial switcher function in dashboard controller	2010-06-21 14:23:59 -07:00
models	just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly	2010-06-19 15:53:37 -07:00
views	added dumb partial switcher function in dashboard controller	2010-06-21 14:23:59 -07:00