diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-11 13:54:21 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-11 13:54:21 +0700 |
| commit | 305d2194136d4560e02c110d528164034d3727b2 (patch) | |
| tree | 40510e1c4dc0140ff16e2fdc483da64c83b7077c /lib/pleroma/formatter.ex | |
| parent | 5b1d7c3c5672af065af503891d156b6e0cf5a8c1 (diff) | |
| parent | 06c4935c11fc58f5ede18706bc46dcc502e64052 (diff) | |
| download | pleroma-305d2194136d4560e02c110d528164034d3727b2.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
Diffstat (limited to 'lib/pleroma/formatter.ex')
| -rw-r--r-- | lib/pleroma/formatter.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 386096a52..f31aafa0d 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -3,10 +3,10 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Formatter do + alias Pleroma.Emoji + alias Pleroma.HTML alias Pleroma.User alias Pleroma.Web.MediaProxy - alias Pleroma.HTML - alias Pleroma.Emoji @tag_regex ~r/((?<=[^&])|\A)(\#)(\w+)/u @markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/ |