[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d1b99c: Fix merge conflicts

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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d1b99c: Fix merge conflicts

2022-02-11 Thread Maurício Meneghini Fauth
Branch: refs/heads/QA_5_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d1b99c4a15c151fa601fa1ce4a113dfdfad5aacb https://github.com/phpmyadmin/phpmyadmin/commit/d1b99c4a15c151fa601fa1ce4a113dfdfad5aacb Author: Maurício Meneghini Fauth Date: 2022-02-11 (Fri, 02 February 2022) -03:00 Chang