nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config
History
Raphael 33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
2010-09-15 17:24:00 -07:00
..
environments Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
initializers License notices replaced 2010-09-15 10:58:48 -07:00
locales License notices replaced 2010-09-15 10:58:48 -07:00
sprinkle Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
app_config.yml License notices replaced 2010-09-15 10:58:48 -07:00
application.rb License notices replaced 2010-09-15 10:58:48 -07:00
boot.rb License notices replaced 2010-09-15 10:58:48 -07:00
deploy.rb Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
deploy_config.yml Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
environment.rb License notices replaced 2010-09-15 10:58:48 -07:00
routes.rb First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
selenium.yml License notices replaced 2010-09-15 10:58:48 -07:00
thin.yml Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00