Ivan Tashkinov b27d8f7437 Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix ... # Conflicts: # CHANGELOG.md		2020-11-19 19:35:44 +03:00
..
credo/check/consistency
fixtures	Fix object spoofing vulnerability in attachments	2020-11-12 15:25:33 +03:00
instance_static
mix	pleroma.instance: Fix Exiftool module name	2020-11-14 22:31:01 +01:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix	2020-11-19 19:35:44 +03:00
support	Fix object spoofing vulnerability in attachments	2020-11-12 15:25:33 +03:00
test_helper.exs