Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c964633278cdc5c70e4be3adfb6cbe906d1340b8 https://github.com/phpmyadmin/phpmyadmin/commit/c964633278cdc5c70e4be3adfb6c... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M libraries/Response.php Log Message: ----------- Provide diagnostics for JSON encoding errors Issue #11705 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 07c2f262232a784e50e4d7460d3c9b39df65ee9c https://github.com/phpmyadmin/phpmyadmin/commit/07c2f262232a784e50e4d7460d3c... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M ChangeLog M libraries/Index.php Log Message: ----------- Add workaround for PHP bug I'm unable to better diagnose the problem right now, so let's workaround it so that it's working for users. Fixes #11705 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: f01b3b7ddd7b2f2bfaccbabb263c9ea1b8690d8b https://github.com/phpmyadmin/phpmyadmin/commit/f01b3b7ddd7b2f2bfaccbabb263c... Author: Michal Čihař <michal@cihar.com> Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M ChangeLog M libraries/Index.php M libraries/Response.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/16818f7ad330...f01b3b7ddd7b