Merge pull request #1218 from R0ckweb/patch-2

author Eugen <eugen@zeonfederated.com>

Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)

committer GitHub <noreply@github.com>

Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)
author Eugen <eugen@zeonfederated.com>
Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)
committer GitHub <noreply@github.com>
Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)
diff --cc app/services/follow_remote_account_service.rb
Simple merge
author	Eugen <eugen@zeonfederated.com>
	Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)
committer	GitHub <noreply@github.com>
	Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)