Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a16d1c9a6a41336ab751830f3c408613978628a8 https://github.com/phpmyadmin/phpmyadmin/commit/a16d1c9a6a41336ab751830f3c40... Author: Yogi Erka Julyansa Putra <erka.j.p@gmail.com> Date: 2016-10-02 (Sun, 02 Oct 2016) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 68.8% (2208 of 3206 strings) [CI skip] Commit: ada82985082c0a4be0cb3df06b667345d7202973 https://github.com/phpmyadmin/phpmyadmin/commit/ada82985082c0a4be0cb3df06b66... Author: Dragan Zlatkovski <dragan_natalia@yahoo.com> Date: 2016-10-02 (Sun, 02 Oct 2016) Changed paths: M po/mk.po Log Message: ----------- Translated using Weblate (Macedonian) Currently translated at 17.2% (554 of 3206 strings) [CI skip] Commit: 4fb7d734016c90f49299ce9724f486058b81cdad https://github.com/phpmyadmin/phpmyadmin/commit/4fb7d734016c90f49299ce9724f4... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Don't assume justBrowsing if there is a Join in the query Fix #12189 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: b2d337814a5f99fda19d0bea392a40c0f1b8e154 https://github.com/phpmyadmin/phpmyadmin/commit/b2d337814a5f99fda19d0bea392a... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M po/id.po M po/mk.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 77d1adcc473fc8b8fb94afefd8bc6ffbac338f2d https://github.com/phpmyadmin/phpmyadmin/commit/77d1adcc473fc8b8fb94afefd8bc... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-03 (Mon, 03 Oct 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_6' Conflicts: po/id.po po/mk.po Compare: https://github.com/phpmyadmin/phpmyadmin/compare/128c0607effc...77d1adcc473f