Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 026254225480f2490eb315e3496da8b9f1ed6628 https://github.com/phpmyadmin/phpmyadmin/commit/026254225480f2490eb315e3496d... Author: Michal Čihař <michal@cihar.com> Date: 2017-11-28 (Tue, 28 Nov 2017) Changed paths: M ChangeLog M libraries/Encoding.php Log Message: ----------- Prefer iconv for encoding conversions The mb extension is usually present, however it does not support that wide range of charsers. Basically this reverts d846b2e5d59fc442b77f3868cddbce9cd3172fd7. Fixes #13842 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: bdb17ddcd23ce168ebe3e1afbf876768d9713809 https://github.com/phpmyadmin/phpmyadmin/commit/bdb17ddcd23ce168ebe3e1afbf87... Author: Michal Čihař <michal@cihar.com> Date: 2017-11-28 (Tue, 28 Nov 2017) Changed paths: M ChangeLog M libraries/classes/Encoding.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0654cc490dfb...bdb17ddcd23c