Tusooa Zhu 4edc867b87 Merge branch 'develop' into 'from/upstream-develop/tusooa/edits' ...

# Conflicts:
#   lib/pleroma/constants.ex

2022-07-03 22:24:57 +00:00

..

mix

Rename the Exiftool module

2022-07-01 12:15:02 +02:00

phoenix/transports/web_socket

Copyright bump for 2022

2022-02-25 23:11:42 -07:00

pleroma

Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'

2022-07-03 22:24:57 +00:00