nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec
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
..
controllers Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
fixtures Changing to a smaller pic in the tests 2010-08-18 16:00:06 -07:00
helpers added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
lib Put raise back in webfinger fail 2010-09-13 16:05:43 -07:00
models Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00
factories.rb Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00
misc_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
spec_helper.rb Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00
user_encryption_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00