Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5a4a3e70acee94c16431f9c0011c3db95b9d0d64 https://github.com/phpmyadmin/phpmyadmin/commit/5a4a3e70acee94c16431f9c0011c... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-04-28 (Thu, 28 Apr 2016) Changed paths: M doc/config.rst M doc/import_export.rst Log Message: ----------- Fix minor typos Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 5a4af02291dde94896d4a890c49fbc0d0acd64cf https://github.com/phpmyadmin/phpmyadmin/commit/5a4af02291dde94896d4a890c49f... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-04-29 (Fri, 29 Apr 2016) Changed paths: M ChangeLog M doc/config.rst M libraries/DatabaseInterface.php M libraries/Menu.php M libraries/config.default.php M po/zh_TW.po Log Message: ----------- Merge remote-tracking branch 'upstream/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7034681cfb12...5a4af02291dd