Merge branch 'master' into 'otp26'

# Conflicts:
#   .gitignore
This commit is contained in:
lain 2023-12-23 11:22:18 +00:00
commit cd38cd6b88

5
.gitignore vendored
View file

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-FileCopyrightText: 2017-2023 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: LGPL-3.0-only
# The directory Mix will write compiled artifacts to.
@ -25,4 +25,5 @@ erl_crash.dump
# Ignore package tarball (built via "mix hex.build").
http_signatures-*.tar
mix.lock
# Counter-productive for libraries
/mix.lock