Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 599f1d24551feaf940bb93011647c73cd44f1fc1
      
https://github.com/phpmyadmin/phpmyadmin/commit/599f1d24551feaf940bb93011647c73cd44f1fc1
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Avoid parsing non JSON responses as JSON

This is just a changelog entry, real fix was in
d344a8f7ae54405f5a7a56ebc3158255cc36b95c.

Fixes #12240

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 06da17077c0f6e73ac8313881fe5ea2d7941b1fd
      
https://github.com/phpmyadmin/phpmyadmin/commit/06da17077c0f6e73ac8313881fe5ea2d7941b1fd
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M ChangeLog

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/b24347ca8f38...06da17077c0f
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to