Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline

author dtluna <dtluna@openmailbox.org>

Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)

committer dtluna <dtluna@openmailbox.org>

Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)
author dtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)
committer dtluna <dtluna@openmailbox.org>
Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge
diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc test/web/twitter_api/twitter_api_test.exs
Simple merge
author	dtluna <dtluna@openmailbox.org>
	Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)
committer	dtluna <dtluna@openmailbox.org>
	Sun, 16 Apr 2017 10:32:56 +0000 (13:32 +0300)
		1	2
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/twitter_api.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/twitter_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/twitter_api/twitter_api_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history