Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 96b40611db914f2e4f09fa1b94059ee49fb245fc
      
https://github.com/phpmyadmin/phpmyadmin/commit/96b40611db914f2e4f09fa1b94059ee49fb245fc
  Author: SDSkyKlouD <koongchi...@gmail.com>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 78.9% (2530 of 3206 strings)

[CI skip]


  Commit: 55b3366d6493b740a3b108a44e04de0b375f2b8b
      
https://github.com/phpmyadmin/phpmyadmin/commit/55b3366d6493b740a3b108a44e04de0b375f2b8b
  Author: Weblate <nore...@weblate.org>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: 61ec405c16c41d17c9b62bd4d9921ce9fd196562
      
https://github.com/phpmyadmin/phpmyadmin/commit/61ec405c16c41d17c9b62bd4d9921ce9fd196562
  Author: Zulfikar <zulfika...@gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M po/id.po

  Log Message:
  -----------
  Translated using Weblate (Indonesian)

Currently translated at 69.6% (2232 of 3206 strings)

[CI skip]


  Commit: d37af63415732ca6e0503a0fa7938b77f957c222
      
https://github.com/phpmyadmin/phpmyadmin/commit/d37af63415732ca6e0503a0fa7938b77f957c222
  Author: Weblate <nore...@weblate.org>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M js/console.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: 334910216e62ac32bc6ccbead9a2a6c7966506a2
      
https://github.com/phpmyadmin/phpmyadmin/commit/334910216e62ac32bc6ccbead9a2a6c7966506a2
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M js/console.js

  Log Message:
  -----------
  Check if the function actually has arguments or not

Fix #12639

Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>


  Commit: f9ed7a5054ba25532911d05ad8b75ef0846a29da
      
https://github.com/phpmyadmin/phpmyadmin/commit/f9ed7a5054ba25532911d05ad8b75ef0846a29da
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog for #12639

Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>


  Commit: 25ee53c183dd989a09d65c08e7d7f823db4a314f
      
https://github.com/phpmyadmin/phpmyadmin/commit/25ee53c183dd989a09d65c08e7d7f823db4a314f
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M po/id.po

  Log Message:
  -----------
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


  Commit: 555d5104b50a90413e0804c68cbf00220ce902ab
      
https://github.com/phpmyadmin/phpmyadmin/commit/555d5104b50a90413e0804c68cbf00220ce902ab
  Author: Deven Bansod <devenbansod.b...@gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M ChangeLog
    M js/console.js

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

Conflicts:
        po/id.po
        po/ko.po


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/04408b1f5216...555d5104b50a
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to