danielvincent 8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: config/routes.rb		2010-09-22 16:09:25 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-22 16:09:25 -07:00
helpers	RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG	2010-09-21 15:46:57 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora into reposting	2010-09-22 15:49:13 -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 into fb	2010-09-22 16:09:25 -07:00