[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 694d84: ajaxOptions.dataType can also return multiple spac...

[Deven Bansod]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 694d846b6423f27ccf95616d9bdf5aa95e16bf02
      https://github.com/phpmyadmin/phpmyadmin/commit/694d846b6423f27ccf95616d9bdf5aa95e16bf02
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M js/console.js

  Log Message:
  -----------
  ajaxOptions.dataType can also return multiple space-separated values

Ref : http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings

Fix error in d344a8f
Fix #12454

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 8250f8e030c66658ecf1b567017a363230df6d7f
      https://github.com/phpmyadmin/phpmyadmin/commit/8250f8e030c66658ecf1b567017a363230df6d7f
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix typo in ChangeLog

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 32db2e418c60f7f861b235ff2e871efc6842a92a
      https://github.com/phpmyadmin/phpmyadmin/commit/32db2e418c60f7f861b235ff2e871efc6842a92a
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog for #12454

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 25baf8dd85793f5a3659d6307448afe99399d63d
      https://github.com/phpmyadmin/phpmyadmin/commit/25baf8dd85793f5a3659d6307448afe99399d63d
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M po/fr.po

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


  Commit: d15e9a40a424c2be9bd1d12504df0e13253e6908
      https://github.com/phpmyadmin/phpmyadmin/commit/d15e9a40a424c2be9bd1d12504df0e13253e6908
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M ChangeLog
    M js/console.js

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/403462ee88d3...d15e9a40a424