maxwell 0546bb2582 pulled in all of max's changes from yesterday to 187		2010-06-22 10:39:06 -07:00
..
controllers	fixed up some views, but some stuff feels like it broke	2010-06-21 16:46:19 -07:00
helpers	fixed up some views, but some stuff feels like it broke	2010-06-21 16:46:19 -07:00
models	pulled in all of max's changes from yesterday to 187	2010-06-22 10:39:06 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse	2010-06-21 19:24:07 -07:00