Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d8b37769e66570d461c5ac6f964acc62573d5353 https://github.com/phpmyadmin/phpmyadmin/commit/d8b37769e66570d461c5ac6f964a... Author: Marc Delisle <marc@infomarc.info> Date: 2015-03-04 (Wed, 04 Mar 2015) Changed paths: M libraries/select_lang.lib.php Log Message: ----------- [security] Risk of BREACH attack Thanks to Michal Čihař for the message suggestion. Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: ddcf57717ddfd7c9976d37f49a96bf161861398c https://github.com/phpmyadmin/phpmyadmin/commit/ddcf57717ddfd7c9976d37f49a96... Author: Marc Delisle <marc@infomarc.info> Date: 2015-03-04 (Wed, 04 Mar 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: bcbb58162fdb49689196fcf30c8cc8374ec16849 https://github.com/phpmyadmin/phpmyadmin/commit/bcbb58162fdb49689196fcf30c8c... Author: Marc Delisle <marc@infomarc.info> Date: 2015-03-04 (Wed, 04 Mar 2015) Changed paths: M ChangeLog M libraries/select_lang.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2933efc30bd5...bcbb58162fdb