Merge branch 'dev-lanodan-url-regex' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)
commit183ccd18127c657e957f40de43ca309434b2180b
tree9be5f0c898307f01d25c7e347c4afd79aec7be23
parentc004b6ea0a172b3c2a27c40a114d7a67f6d63a9c
parentd5091c3175786e5bcb0449f26cafe1795fd5f5d9
Merge branch 'dev-lanodan-url-regex' into 'develop'

lib/pleroma/formatter.ex: Fix URL regex

Closes #127

See merge request pleroma/pleroma!69
config/config.exs
lib/pleroma/formatter.ex