Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: be237a7b511b5ff146297557edabb69a61fefb2b
      
https://github.com/phpmyadmin/phpmyadmin/commit/be237a7b511b5ff146297557edabb69a61fefb2b
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M ChangeLog
    M js/tbl_change.js
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  rfe #954  Allow SALT in ENCRYPT function

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: f8f05f36f7d5e148c4b8717d5c0260407a419543
      
https://github.com/phpmyadmin/phpmyadmin/commit/f8f05f36f7d5e148c4b8717d5c0260407a419543
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/be03cb3f27d1...f8f05f36f7d5
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to