fixing conflicts

Merge pull request laravel#4322 from kauhat/patch-1

Ignore the Yarn error log

Merge pull request laravel#4261 from mhayes14/master

Add missing IPv4/IPv6 validation messages

Merge pull request laravel#4247 from laurencei/patch-1

Revert Queue Prefix

Merge pull request laravel#4234 from tillkruss/master

Updated changelog

Merge pull request laravel#4180 from halaei/unindex-token

unindex token

ignore testing dir

move fontsls

Merge pull request laravel#4117 from fzoske/windows-fix

Ensure cross-env gets executed by node

Merge pull request laravel#4113 from laravel/yarn-fix

Make scripts work with Yarn