maxwell 3dce5f1b34 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-06-28 16:15:48 -07:00
..
controllers	commiting so i can pull	2010-06-28 14:47:23 -07:00
helpers	IZ, RS; Moved XML parser to lib	2010-06-28 15:56:46 -04:00
models	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 16:15:48 -07:00
views	fixed the remote socket updating bug? we will see	2010-06-28 16:15:30 -07:00