nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec/controllers
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
..
dashboards_controller_spec.rb MS DG; more tests pass after making person have many people 2010-08-05 13:25:31 -07:00
publics_controller_spec.rb MS DG; more tests pass after making person have many people 2010-08-05 13:25:31 -07:00
sockets_controller_spec.rb Merge branch 'master' of github.com:diaspora/diaspora_rails into 2010-08-05 15:13:05 -07:00