diff options
| author | lain <lain@soykaf.club> | 2020-02-11 17:09:48 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-02-11 17:09:48 +0000 |
| commit | 01984d15cee6682afdb4c393ee0e6d0059bdb87c (patch) | |
| tree | 2527a726e174d90e3a203ca1bdf48086c61cd3d4 /config | |
| parent | 3fee859b60d2b97e8210faf872a03d99cfc574cc (diff) | |
| parent | 237b2068f9bb23c590420fda3ac677badd9d839f (diff) | |
| download | pleroma-01984d15cee6682afdb4c393ee0e6d0059bdb87c.tar.gz pleroma-01984d15cee6682afdb4c393ee0e6d0059bdb87c.zip | |
Merge branch 'revert-3fee859b' into 'develop'
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
See merge request pleroma/pleroma!2199
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 364aaf776..41c1ff637 100644 --- a/config/config.exs +++ b/config/config.exs @@ -612,8 +612,6 @@ config :pleroma, :modules, runtime_dir: "instance/modules" config :pleroma, configurable_from_database: false -config :floki, :html_parser, Floki.HTMLParser.FastHtml - # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |