Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 584c4e4b42ab230497e0caeac68edcb14a6c253d https://github.com/phpmyadmin/phpmyadmin/commit/584c4e4b42ab230497e0caeac68e... Author: Michal Čihař <michal@cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M doc/glossary.rst Log Message: ----------- Fix syntax in documentation markup Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 12f596ceb203692673e37e2c7106a0dc0f80e824 https://github.com/phpmyadmin/phpmyadmin/commit/12f596ceb203692673e37e2c7106... Author: Michal Čihař <michal@cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M libraries/php-gettext/gettext.inc Log Message: ----------- Fix PHP error when mbstring is not installed It is still dependency for us, but we should be able to tell user nicely that it is missing. Fixes #12734 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 14d6e2048f0756312b6bae79d61daca1b31ae036 https://github.com/phpmyadmin/phpmyadmin/commit/14d6e2048f0756312b6bae79d61d... Author: Michal Čihař <michal@cihar.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84c977b2a43a...14d6e2048f07