nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec/lib/postzord
History
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
..
dispatcher
receiver Merge branch 'develop' into issue_5149 2014-08-26 17:11:39 -07:00
dispatcher_spec.rb
receiver_spec.rb