Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4d9b9cad36df6c7e1e1320b97318345ab01448da https://github.com/phpmyadmin/phpmyadmin/commit/4d9b9cad36df6c7e1e1320b9731… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-06 (Tue, 06 Jun 2017) Changed paths: M ChangeLog A doc/settings.rst M doc/setup.rst M doc/user.rst Log Message: ----------- Added documentation on user settings Fixes #13193 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 24c0e48f5093218e3dc6eaf303cbc9b17d773da3 https://github.com/phpmyadmin/phpmyadmin/commit/24c0e48f5093218e3dc6eaf303c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-06 (Tue, 06 Jun 2017) Changed paths: M ChangeLog A doc/settings.rst M doc/setup.rst M doc/user.rst Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/456f3bfffd62...24c0e48f5093