diaspora/spec/lib/postzord/receiver
khall c27b38d69a Merge branch 'develop' into issue_5149
Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/conversations_controller_spec.rb
	spec/controllers/people_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/integration/receiving_spec.rb
	spec/lib/postzord/receiver/public_spec.rb
	spec/models/post_spec.rb
	spec/models/user/querying_spec.rb
2014-08-26 17:11:39 -07:00
..
local_batch_spec.rb Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
private_spec.rb Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
public_spec.rb Merge branch 'develop' into issue_5149 2014-08-26 17:11:39 -07:00