summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-02-28 16:18:09 -0600
committerMark Felder <feld@FreeBSD.org>2020-02-28 16:18:09 -0600
commitbdd603e9f38eba80d67c63803d07afbc5e1c72b5 (patch)
tree5dee580b6af180d08bf9849fe6ff7eb1035a9bfc /config/config.exs
parentc28de939129f48c02fcc34de7ee1411978f65e2b (diff)
parentd075bdc9e9b0d12b12939223e0603a7afe5af2c5 (diff)
downloadpleroma-bdd603e9f38eba80d67c63803d07afbc5e1c72b5.tar.gz
pleroma-bdd603e9f38eba80d67c63803d07afbc5e1c72b5.zip
Merge branch 'develop' into update/pleroma-fe-20200228
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 9d1e29c0d..0dde1fc85 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -402,6 +402,8 @@ config :phoenix, :format_encoders, json: Jason
config :phoenix, :json_library, Jason
+config :phoenix, :filter_parameters, ["password", "confirm"]
+
config :pleroma, :gopher,
enabled: false,
ip: {0, 0, 0, 0},