Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dfd0150d7bed308859ea604e68dc75c6e2b80d0c https://github.com/phpmyadmin/phpmyadmin/commit/dfd0150d7bed308859ea604e68dc... Author: Isaac Bennetch bennetch@gmail.com Date: 2019-03-28 (Thu, 03 March 2019) -04:00

Changed paths: M ChangeLog M prefs_manage.php

Log Message: ----------- Improved label in Settings export, clarifying that it's a JSON file

Fixes: #15115

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: 7f4d2f9118b8a192164ae402785c3c9947dc43ee https://github.com/phpmyadmin/phpmyadmin/commit/7f4d2f9118b8a192164ae402785c... Author: Isaac Bennetch bennetch@gmail.com Date: 2019-03-28 (Thu, 03 March 2019) -04:00

Changed paths: M ChangeLog M prefs_manage.php

Log Message: ----------- Merge branch 'QA_4_8'

Signed-off-by: Isaac Bennetch bennetch@gmail.com