From c27b38d69af21d5618f476707e2197d50e6570f1 Mon Sep 17 00:00:00 2001
From: khall <kevinmichaelhall@gmail.com>
Date: Mon, 25 Aug 2014 13:58:39 -0700
Subject: [PATCH] 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
---
 spec/lib/postzord/receiver/public_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/lib/postzord/receiver/public_spec.rb b/spec/lib/postzord/receiver/public_spec.rb
index 4507af473..a1eaab462 100644
--- a/spec/lib/postzord/receiver/public_spec.rb
+++ b/spec/lib/postzord/receiver/public_spec.rb
@@ -61,7 +61,7 @@ describe Postzord::Receiver::Public do
         @receiver.perform!
       end
 
-      it 'enqueues a Workers::ReceiveLocalBatch' do 
+      it 'enqueues a Workers::ReceiveLocalBatch' do
         expect(Workers::ReceiveLocalBatch).to receive(:perform_async).with(anything, anything, anything)
         @receiver.perform!
       end