Raphael f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge		2010-10-18 12:00:20 -07:00
..
controllers	Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge	2010-10-18 12:00:20 -07:00
helpers	Modified spec (doesn't check Youtube handling due to disabled net::http)	2010-10-17 21:07:49 +02:00
models	the user destroy now deletes the aspects	2010-10-18 10:26:45 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Merge remote branch 'rmaskey/269-album-link'	2010-10-18 11:27:13 -07:00