diaspora/lib
maxwell 5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
2010-08-05 15:13:05 -07:00
..
diaspora Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -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 Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00
message_handler.rb RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00