nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/lib/diaspora/user
History
danielgrippi 106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
..
connecting.rb fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
querying.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00