danielvincent 7f795e05cb Merge branch 'master' into half-decent ...

Conflicts:
	app/controllers/dashboard_controller.rb

2010-06-21 14:25:22 -07:00

..

application_controller.rb

DG MS; receive hook working.

2010-06-17 18:29:56 -07:00

blogs_controller.rb

made everyting so the lastest is the first thing you see

2010-06-17 20:58:20 -07:00

bookmarks_controller.rb

made everyting so the lastest is the first thing you see

2010-06-17 20:58:20 -07:00

dashboard_controller.rb

added dumb partial switcher function in dashboard controller

2010-06-21 14:23:59 -07:00

friends_controller.rb

made everyting so the lastest is the first thing you see

2010-06-17 20:58:20 -07:00

status_messages_controller.rb

Merge branch 'master' into half-decent

2010-06-21 14:25:22 -07:00

users_controller.rb

made everyting so the lastest is the first thing you see

2010-06-17 20:58:20 -07:00