Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 5e536ab5f9fa19b288d32b2eddb7546c73f9efb2
https://github.com/phpmyadmin/phpmyadmin/commit/5e536ab5f9fa19b288d32b2eddb…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M libraries/dbi/DBIMysqli.php
Log Message:
-----------
Do not set key if not set in config
Issue #12293
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 5bc426742dced3cde8c859bbea885d844b3a6a07
https://github.com/phpmyadmin/phpmyadmin/commit/5bc426742dced3cde8c859bbea8…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M libraries/dbi/DBIMysqli.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/5f8e40941b63...5bc426742dce