diff options
author | tusooa <tusooa@kazv.moe> | 2022-09-05 15:00:19 +0000 |
---|---|---|
committer | tusooa <tusooa@kazv.moe> | 2022-09-05 15:00:19 +0000 |
commit | 9874b4c985ea715a37cf2d2a5c8db2fb26e28f3a (patch) | |
tree | e495f10d3cac124d405cfe01015821a930f3a1df /mix.exs | |
parent | e06f2b9f5ea58c90cafd7864a66809fe8ea0a96f (diff) | |
parent | f8afba95b20670b5d6e93896ccd27bb3fca003a2 (diff) | |
download | pleroma-9874b4c985ea715a37cf2d2a5c8db2fb26e28f3a.tar.gz |
Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'mix.exs')
-rw-r--r-- | mix.exs | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -80,7 +80,8 @@ defmodule Pleroma.Mixfile do :quack, :fast_sanitize, :os_mon, - :ssl + :ssl, + :esshd ], included_applications: [:ex_syslogger] ] |