maxwell 3a8394bd59 Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse		2010-06-21 19:24:07 -07:00
..
blog.rb	DG MS more test cleanup and removed a deprecation warning	2010-06-15 17:38:12 -07:00
bookmark.rb	DG MS; resolved unknown types going to receive handler. only post objects are inputted	2010-06-18 16:47:34 -07:00
friend.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse	2010-06-21 19:24:07 -07:00
post.rb	websockets work	2010-06-21 14:12:05 -07:00
status_message.rb	fixed merge	2010-06-20 11:13:21 -07:00
user.rb	DG IZ; friend and owner now require a real name	2010-06-21 15:56:40 -07:00