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 |
||
|---|---|---|
| .. | ||
| local_batch_spec.rb | ||
| private_spec.rb | ||
| public_spec.rb | ||