hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into frontend-admin-api

Browse source
This commit is contained in:
Egor Kislitsyn 2020-11-17 18:34:04 +04:00
commit f69fe36ebf
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
168 changed files with 2603 additions and 1901 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/mix/tasks/pleroma/instance.ex
View file

@ -284,7 +284,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
defp upload_filters(filters) when is_map(filters) do
enabled_filters =
if filters.strip do
[Pleroma.Upload.Filter.ExifTool]
[Pleroma.Upload.Filter.Exiftool]
else
[]
end