Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ea422a327ef73ba8bd60bf6f23205ef069563781 https://github.com/phpmyadmin/phpmyadmin/commit/ea422a327ef73ba8bd60bf6f2320... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths: M libraries/phpseclib/Crypt/AES.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/phpseclib/Crypt/Rijndael.php A libraries/phpseclib/LICENSE M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP Update phpseclib to version 2.0.0
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 790671864b539df093b059aba6fbb9c49a9dcb21 https://github.com/phpmyadmin/phpmyadmin/commit/790671864b539df093b059aba6fb... Author: Marc Delisle marc@infomarc.info Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths: M libraries/phpseclib/Crypt/AES.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/phpseclib/Crypt/Rijndael.php A libraries/phpseclib/LICENSE M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Merge pull request #11391 from madhuracj/issue11387
Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP
Commit: 7c63935d721af8985f9b3eb7921707f26e0d2cb2 https://github.com/phpmyadmin/phpmyadmin/commit/7c63935d721af8985f9b3eb79217... Author: Marc Delisle marc@infomarc.info Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 2bfe60538489a8167ae1f687c705920c4d19aec2 https://github.com/phpmyadmin/phpmyadmin/commit/2bfe60538489a8167ae1f687c705... Author: Marc Delisle marc@infomarc.info Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths: M ChangeLog M libraries/phpseclib/Crypt/AES.php M libraries/phpseclib/Crypt/Base.php M libraries/phpseclib/Crypt/Random.php M libraries/phpseclib/Crypt/Rijndael.php A libraries/phpseclib/LICENSE M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6e23dcfc26ea...2bfe60538489