danielvincent ce132dd782 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-07-09 18:54:59 -07:00
..
controllers	MS flash now gives message if you have already friended a given person	2010-07-09 18:53:47 -07:00
helpers	DG MS fixed spec	2010-07-08 20:51:12 -07:00
models	DG MS debugging friend request	2010-07-09 18:41:39 -07:00
views	added unfriend button to person show page	2010-07-09 18:54:48 -07:00