maxwell d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ...

Conflicts:
	app/controllers/publics_controller.rb
	app/models/user.rb

2010-08-09 17:31:46 -07:00

..

diaspora

Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor

2010-08-09 17:31:46 -07:00

net

DG MS; completed event-queue intergration.

2010-06-17 14:29:41 -07:00

tasks

RS, IZ; Removing gpg infrastructure

2010-08-05 10:46:29 -07:00

chrome_frame.rb

added mean message

2010-07-01 17:05:14 -07:00

diaspora.rb

RS, IZ; extracted and murdered ostatus.

2010-08-04 16:00:01 -07:00

encryptable.rb

Changed info logging to debug logging almost everywhere

2010-08-09 14:39:37 -07:00

message_handler.rb

RS, IZ; removed lots of putses, fixed up request, parser, retractions

2010-08-06 16:01:39 -07:00