Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6566e9491438dc46f5accb7540b0c9a178689092
      
https://github.com/phpmyadmin/phpmyadmin/commit/6566e9491438dc46f5accb7540b0c9a178689092
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-12 (Fri, 12 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/error_report.lib.php

  Log Message:
  -----------
  Correct content type for uploaded error reports

Fixes #11939

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


  Commit: 5f0aa04560e745fa43d2a5e94b07b04f98009516
      
https://github.com/phpmyadmin/phpmyadmin/commit/5f0aa04560e745fa43d2a5e94b07b04f98009516
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-12 (Fri, 12 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  Silent errors from checking local documentation

The file_exists can issue error in case of open_basedir restrictions.

Fixes #11940

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


  Commit: bfe0e8814ef48ed4d4473fa5a35aa4ec1aa65943
      
https://github.com/phpmyadmin/phpmyadmin/commit/bfe0e8814ef48ed4d4473fa5a35aa4ec1aa65943
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-02-12 (Fri, 12 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/Util.php
    M libraries/error_report.lib.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/f1dbd56798c3...bfe0e8814ef4
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to