diaspora

mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00

Files

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

2010-09-15 13:28:06 -07:00

2010-09-15 13:28:06 -07:00

License notices replaced

2010-09-15 10:58:48 -07:00

fixing merge

2010-09-15 13:29:39 -07:00

2010-09-15 17:24:00 -07:00

factories.rb

2010-09-15 17:24:00 -07:00

misc_spec.rb

License notices replaced

2010-09-15 10:58:48 -07:00

spec_helper.rb

2010-09-15 11:01:11 -07:00

user_encryption_spec.rb

2010-09-15 13:28:06 -07:00