Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a2898d760e4ec0aa095d34e9d73b463b201453ac
      
https://github.com/phpmyadmin/phpmyadmin/commit/a2898d760e4ec0aa095d34e9d73b463b201453ac
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2015-09-05 (Sat, 05 Sep 2015)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Fixes #11463 Cannot redeclare class phpseclib\Crypt\AES

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 93e4af9dd688a34b95ebbbaf12f780c9e76ef5ab
      
https://github.com/phpmyadmin/phpmyadmin/commit/93e4af9dd688a34b95ebbbaf12f780c9e76ef5ab
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2015-09-05 (Sat, 05 Sep 2015)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/aa84bfd5940e...93e4af9dd688
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to