ilya 8894fa4daa Merge branch 'master' of github.com:diaspora/diaspora

2010-10-18 16:28:57 -07:00

..

controllers

invite sends friend request if already friends, and raises if already friends

2010-10-18 16:27:02 -07:00

helpers

Modified spec (doesn't check Youtube handling due to disabled net::http)

2010-10-17 21:07:49 +02:00

models

invite sends friend request if already friends, and raises if already friends

2010-10-18 16:27:02 -07:00

uploaders

Add or later to license notice

2010-10-07 16:25:34 -07:00

views

Merge branch 'master' of github.com:diaspora/diaspora

2010-10-18 15:46:44 -07:00