Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0e0fdf985a29d2f20f3c115e748a6d8becc19eaa https://github.com/phpmyadmin/phpmyadmin/commit/0e0fdf985a29d2f20f3c115e748a... Author: an wei justregonly1@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)
Changed paths: M po/zh_CN.po
Log Message: ----------- Translated using Weblate (Chinese (China))
Currently translated at 88.0% (2824 of 3206 strings)
[CI skip]
Commit: cc161ba3107b935808c9550728c337ce3de32090 https://github.com/phpmyadmin/phpmyadmin/commit/cc161ba3107b935808c9550728c3... Author: Dadan Setia da2n_s@yahoo.co.id Date: 2016-10-03 (Mon, 03 Oct 2016)
Changed paths: M po/id.po
Log Message: ----------- Translated using Weblate (Indonesian)
Currently translated at 68.8% (2207 of 3206 strings)
[CI skip]
Commit: b9adbff762a3fcf3f20e5a2fb0caad9f9ca001e0 https://github.com/phpmyadmin/phpmyadmin/commit/b9adbff762a3fcf3f20e5a2fb0ca... Author: Weblate noreply@weblate.org Date: 2016-10-03 (Mon, 03 Oct 2016)
Changed paths: M libraries/sql.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 6a53b89cb7fa9e74ec05e04654242e3368122d00 https://github.com/phpmyadmin/phpmyadmin/commit/6a53b89cb7fa9e74ec05e0465424... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Escape database name properly to be used in MySQL wildcard statements
Fix #12602
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: c202b7a87ce0318e848faa6e5d8a24f3f1e9313f https://github.com/phpmyadmin/phpmyadmin/commit/c202b7a87ce0318e848faa6e5d8a... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)
Changed paths: M po/id.po M po/zh_CN.po
Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6
Commit: 9419526304ddda1c9387bea924ad52561076b485 https://github.com/phpmyadmin/phpmyadmin/commit/9419526304ddda1c9387bea924ad... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-03 (Mon, 03 Oct 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Merge branch 'QA_4_6'
Conflicts: po/id.po po/zh_CN.po
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/be1adf18e456...9419526304dd
-
Deven Bansod