Merge branch 'fix/credo-issues' into 'develop'

author kaniini <nenolod@gmail.com>

Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)

committer kaniini <nenolod@gmail.com>

Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)
author kaniini <nenolod@gmail.com>
Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)
committer kaniini <nenolod@gmail.com>
Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)
diff --cc lib/pleroma/object.ex
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge
diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
Simple merge
diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge
author	kaniini <nenolod@gmail.com>
	Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)
committer	kaniini <nenolod@gmail.com>
	Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)
		1	2
lib/pleroma/object.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/utils.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/twitter_api.ex	patch \|	diff1 \|	diff2 \|	blob \| history