nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec
History
maxwell 5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into 
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
2010-08-05 15:13:05 -07:00
..
controllers Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00
fixtures RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
helpers RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
lib Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00
models Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00
factories.rb Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00
misc_spec.rb Sorry rspec 2010-07-07 10:55:32 -07:00
spec_helper.rb RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
user_encryption_spec.rb RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00