Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e555d0e6abc080594720f333b832ff61be0ec936 https://github.com/phpmyadmin/phpmyadmin/commit/e555d0e6abc080594720f333b832... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-22 (Wed, 22 Jul 2015)

Changed paths: M libraries/sql_query_form.lib.php

Log Message: ----------- Fix legend for table SQL page

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

Commit: 81f5c747c256d01025be0034cab5a949369008ab https://github.com/phpmyadmin/phpmyadmin/commit/81f5c747c256d01025be0034cab5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-22 (Wed, 22 Jul 2015)

Changed paths: M libraries/sql_query_form.lib.php

Log Message: ----------- Merge branch 'QA_4_4'

Conflicts: libraries/sql_query_form.lib.php

Commit: 1c39ce5ccf890807e0287091b4a9db0e16c1fbe5 https://github.com/phpmyadmin/phpmyadmin/commit/1c39ce5ccf890807e0287091b4a9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-22 (Wed, 22 Jul 2015)

Changed paths: M doc/setup.rst M js/tbl_change.js M po/ko.po

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/27c5a92f97e9...1c39ce5ccf89