Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 274ef03d42b2a1a0aa0f9163e3084e1f8c3a4a30
      
https://github.com/phpmyadmin/phpmyadmin/commit/274ef03d42b2a1a0aa0f9163e3084e1f8c3a4a30
  Author: Stefano Martinelli <[email protected]>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M po/it.po

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

Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]


  Commit: 2dee421a72824a5493bcf816d6baeb74bc3584c9
      
https://github.com/phpmyadmin/phpmyadmin/commit/2dee421a72824a5493bcf816d6baeb74bc3584c9
  Author: dingo thirteen <[email protected]>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]


  Commit: d45e61efc596ae11ca4f0699a8a3efaaa0d10f23
      
https://github.com/phpmyadmin/phpmyadmin/commit/d45e61efc596ae11ca4f0699a8a3efaaa0d10f23
  Author: Michal Čihař <[email protected]>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M ChangeLog
    M libraries/Config.php

  Log Message:
  -----------
  Avoid PHP errors with non existing configuration on OS X

It sems that @ does notwork on fileperms there according to error
reports.

Fixes #13386

Signed-off-by: Michal Čihař <[email protected]>


  Commit: 14f738c262296f4fabf45f9db47ea22adc3c6d1a
      
https://github.com/phpmyadmin/phpmyadmin/commit/14f738c262296f4fabf45f9db47ea22adc3c6d1a
  Author: Michal Čihař <[email protected]>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M ChangeLog
    M libraries/Encoding.php
    M libraries/display_export.lib.php
    M libraries/display_import.lib.php
    M test/classes/EncodingTest.php

  Log Message:
  -----------
  Show only supported charsets for conversion

Fixes #13388

Signed-off-by: Michal Čihař <[email protected]>


  Commit: c8d7fc4024c3b91797aa886d266caf0ca6fa124e
      
https://github.com/phpmyadmin/phpmyadmin/commit/c8d7fc4024c3b91797aa886d266caf0ca6fa124e
  Author: Michal Čihař <[email protected]>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Log Message:
  -----------
  Merge commit '2dee421a72824a5493bcf816d6baeb74bc3584c9'


  Commit: a22b48351e02b6d733b24e481700459f10a8b1b3
      
https://github.com/phpmyadmin/phpmyadmin/commit/a22b48351e02b6d733b24e481700459f10a8b1b3
  Author: Michal Čihař <[email protected]>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M ChangeLog
    M libraries/Config.php
    M libraries/Encoding.php
    M libraries/display_export.lib.php
    M libraries/display_import.lib.php
    M test/classes/EncodingTest.php

  Log Message:
  -----------
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/d3e7ebff2e7e...a22b48351e02
_______________________________________________
Git mailing list
[email protected]
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to