4 commits

Author	SHA1	Message	Date
Kamil Kokot	f3247f5d1c	Backport symfony/polyfill-mbstring:1.22.0 conflict to make the build passing on 1.8	2021-01-12 11:35:01 +01:00
Tomanhez	dad3cb12ab	Update conflicts.md	2020-12-31 16:42:09 +01:00
Tomanhez	8de9f22936	Remove lcobucci/jwt v3.4 conflict	2020-11-30 13:04:08 +01:00
Kamil Kokot	1b58837601	Add conflict with lcobucci/jwt to prevent Behat build failures	2020-11-25 16:19:16 +01:00