Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d1b99c4a15c151fa601fa1ce4a113dfdfad5aacb https://github.com/phpmyadmin/phpmyadmin/commit/d1b99c4a15c151fa601fa1ce4a11... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-02-11 (Fri, 02 February 2022) -03:00

Changed paths: M libraries/classes/ErrorHandler.php M libraries/classes/Routing.php M psalm-baseline.xml

Log Message: ----------- Fix merge conflicts

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: fb2a94c8bcc166798fb154f15bb6de7706b942de https://github.com/phpmyadmin/phpmyadmin/commit/fb2a94c8bcc166798fb154f15bb6... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-02-11 (Fri, 02 February 2022) -03:00

Changed paths: M libraries/classes/ErrorHandler.php M libraries/classes/Routing.php

Log Message: ----------- Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev