Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fe802e1d6a0278f4caf68d9c45a3da075d5c16a8 https://github.com/phpmyadmin/phpmyadmin/commit/fe802e1d6a0278f4caf68d9c45a3... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-12-05 (Mon, 05 Dec 2016)

Changed paths: M ChangeLog M libraries/sql-parser/src/Utils/Formatter.php

Log Message: ----------- Fix #12780 Format button replaces all text with blank spaces

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

Commit: 64b4017a8558e6cdbe249740e903c6f2def91cbb https://github.com/phpmyadmin/phpmyadmin/commit/64b4017a8558e6cdbe249740e903... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-12-05 (Mon, 05 Dec 2016)

Changed paths: M ChangeLog

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/93e9ef04f7d7...64b4017a8558