Merge pull request #3803 from syntafin/dev

Fix Emoji Mime Type Validation

app/Http/Controllers/AdminController.php

@@ -523,7 +523,7 @@ class AdminController extends Controller
 					->whereShortcode($request->input('shortcode'));
 				})
 			],
-			'emoji' => 'required|file|mimetypes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000)
+			'emoji' => 'required|file|mimes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000)
 		]);
 
 		$emoji = new CustomEmoji;