Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f99aa697847a778670aac5a08a5f0c496fbabc44 https://github.com/phpmyadmin/phpmyadmin/commit/f99aa697847a778670aac5a08a5f... Author: Jozef Pistej <pistej2@gmail.com> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.6% (2682 of 3206 strings) [CI skip] Commit: 5511b39e1630b07630a78e7ae657f5dd1a087daa https://github.com/phpmyadmin/phpmyadmin/commit/5511b39e1630b07630a78e7ae657... Author: Weblate <noreply@weblate.org> Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M doc/config.rst Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 59cd9bf3a1b6cf292e4d3700301d7d0328977e8d https://github.com/phpmyadmin/phpmyadmin/commit/59cd9bf3a1b6cf292e4d3700301d... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M tbl_export.php Log Message: ----------- Replace FROM clause aliases only if FROM clause is present Fix #12579 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 7084608fff35fd24f1ba7265fd2de408d8e7408b https://github.com/phpmyadmin/phpmyadmin/commit/7084608fff35fd24f1ba7265fd2d... Author: Jozef Pistej <pistej2@gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.6% (2682 of 3206 strings) [CI skip] Commit: 7a80af393ddfc1eebd13a42745193b608180afdb https://github.com/phpmyadmin/phpmyadmin/commit/7a80af393ddfc1eebd13a4274519... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M doc/config.rst Log Message: ----------- Add missing escaping in sample regexp Fixes #12594 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bba3ae2ab53e2b56a80bdc8a7db557412cbf184d https://github.com/phpmyadmin/phpmyadmin/commit/bba3ae2ab53e2b56a80bdc8a7db5... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: f54f8fa322eb3b1e894c24e0fa14383fe853ddc0 https://github.com/phpmyadmin/phpmyadmin/commit/f54f8fa322eb3b1e894c24e0fa14... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12579 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: d6571ef86c044cf6127bedfba3294be91676e8c4 https://github.com/phpmyadmin/phpmyadmin/commit/d6571ef86c044cf6127bedfba329... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-09-28 (Wed, 28 Sep 2016) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- Merge branch 'QA_4_6' Conflicts: po/sk.po Compare: https://github.com/phpmyadmin/phpmyadmin/compare/353aadbafb5e...d6571ef86c04