danielvincent 8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb ... Conflicts: config/routes.rb		2010-09-22 16:09:25 -07:00
..
environments	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00
initializers	DG IZ; example extension convention for app_config	2010-09-22 10:59:23 -07:00
locales	Add translation (from English locale) to Brazilian Portuguese	2010-09-23 01:15:10 +08:00
sprinkle	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-17 15:33:51 -07:00
app_config.yml.example	DG IZ; example extension convention for app_config	2010-09-22 10:59:23 -07:00
application.rb	Don't log huge encrypted params	2010-09-22 15:19:26 -07:00
boot.rb	Spell our own name right	2010-09-15 17:56:18 -07:00
deploy.rb	tiny typo	2010-09-21 17:40:43 -07:00
deploy_config.yml	Put master deploy info back in master	2010-09-17 14:39:15 -07:00
environment.rb	basic setup	2010-09-21 12:29:39 -07:00
fb_config.yml	basic setup	2010-09-21 12:29:39 -07:00
routes.rb	DG IZ; cleanup	2010-09-22 15:48:50 -07:00
selenium.yml	Spell our own name right	2010-09-15 17:56:18 -07:00
thin.yml	Move thin yml back to development mode	2010-09-20 12:51:47 -07:00