nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config/environments
History
Raphael c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
2010-09-15 22:37:05 -07:00
..
development.rb Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
production.rb Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 22:37:05 -07:00
test.rb Cleanup stray whitespace 2010-09-16 10:07:59 +08:00