Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 89dd577d2fa26dac844c5a5e74ab10c7985c3167 https://github.com/phpmyadmin/phpmyadmin/commit/89dd577d2fa26dac844c5a5e74ab... Author: Michal Čihař michal@cihar.com Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths: M ChangeLog M js/config.js
Log Message: ----------- Show no local storage warning only on settings tab
It really makes no sense to show it on every page when we're checking whether there are settings to import.
Fixes #12699
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f4d8f6c15148fff6c3464609613011aed2f88e0f https://github.com/phpmyadmin/phpmyadmin/commit/f4d8f6c15148fff6c34646096130... Author: Michal Čihař michal@cihar.com Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths: M ChangeLog M js/config.js
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/988c8bf89aca...f4d8f6c15148