nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config
History
Daniel Vincent Grippi c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
..
environments Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00
initializers added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
locales added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
sprinkle Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00
app_config.yml added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
application.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
boot.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
environment.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
routes.rb RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
selenium.yml added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
thin.yml Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00