danielvincent b097f93bf5 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-20 11:39:17 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 11:39:17 -07:00
helpers	visual tweaks on header. moved upload a file button to header on album#show	2010-09-19 14:27:20 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 11:39:17 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-20 11:39:17 -07:00