Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7bff1263c8f7dc37de9e90da1eaa38a68ff160a1 https://github.com/phpmyadmin/phpmyadmin/commit/7bff1263c8f7dc37de9e90da1eaa... Author: Michal Čihař michal@cihar.com Date: 2017-11-29 (Wed, 29 Nov 2017)

Changed paths: M composer.json

Log Message: ----------- Revert limitation on phpseclib dependency

Only 2.0.8 is broken, so conflict with that.

Fixes #13846

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 63f5b90ad53613dc4529f0711b2cf1c3a7e55d3c https://github.com/phpmyadmin/phpmyadmin/commit/63f5b90ad53613dc4529f0711b2c... Author: Michal Čihař michal@cihar.com Date: 2017-11-29 (Wed, 29 Nov 2017)

Changed paths: M composer.json

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dd38309300a1...63f5b90ad536