Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 009148075f8630b79eeafc60ef302607146ed20b https://github.com/phpmyadmin/phpmyadmin/commit/009148075f8630b79eeafc60ef30... Author: Michal Čihař michal@cihar.com Date: 2016-06-17 (Fri, 17 Jun 2016)

Changed paths: M libraries/js_escape.lib.php

Log Message: ----------- PMA_jsFormat accepts only strings

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

Commit: 41d5c1e127c77d9ab94dd9309d328dff3fe15392 https://github.com/phpmyadmin/phpmyadmin/commit/41d5c1e127c77d9ab94dd9309d32... Author: Michal Čihař michal@cihar.com Date: 2016-06-17 (Fri, 17 Jun 2016)

Changed paths: M libraries/Sanitize.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cdc7a6c6bfab...41d5c1e127c7