feld 6c8469664a Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059		2020-11-04 17:05:21 +03:00
..
controllers	Merge branch 'chore/elixir-1.11' into 'develop'	2020-11-04 17:05:21 +03:00
views	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00