Merge branch 'dev-lanodan-url-regex' into 'develop'

author kaniini <nenolod@gmail.com>

Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)

committer kaniini <nenolod@gmail.com>

Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)
author kaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)
committer kaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)
diff --cc config/config.exs
Simple merge
diff --cc lib/pleroma/formatter.ex
Simple merge
author	kaniini <nenolod@gmail.com>
	Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)
committer	kaniini <nenolod@gmail.com>
	Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/formatter.ex	patch \|	diff1 \|	diff2 \|	blob \| history