nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec/models/user
History
danielgrippi 648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
..
attack_vectors_spec.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
connecting_spec.rb Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
invite_spec.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
posting_spec.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
querying_spec.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00