Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 38ce0c9d445c0187115267c0d86db62df4849f0a https://github.com/phpmyadmin/phpmyadmin/commit/38ce0c9d445c0187115267c0d86d... Author: Michal Čihař michal@cihar.com Date: 2016-08-28 (Sun, 28 Aug 2016)

Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php

Log Message: ----------- Remove unused paramenter when connecting to MySQLi

Fixes #12502

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 44f5b605ae020f85adbe463d5022c39ed2912236 https://github.com/phpmyadmin/phpmyadmin/commit/44f5b605ae020f85adbe463d5022... Author: Michal Čihař michal@cihar.com Date: 2016-08-28 (Sun, 28 Aug 2016)

Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/63600798fdc7...44f5b605ae02