Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 53f524781121535fe44e704c99b71edf01cf7441 https://github.com/phpmyadmin/phpmyadmin/commit/53f524781121535fe44e704c99b7... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2021-01-05 (Tue, 01 January 2021) -03:00 Changed paths: A templates/config/form_display/display.twig M libraries/classes/Config/FormDisplay.php M libraries/classes/Config/FormDisplayTemplate.php M libraries/classes/Config/PageSettings.php M libraries/classes/Controllers/Preferences/ExportController.php M libraries/classes/Controllers/Preferences/FeaturesController.php M libraries/classes/Controllers/Preferences/ImportController.php M libraries/classes/Controllers/Preferences/MainPanelController.php M libraries/classes/Controllers/Preferences/NavigationController.php M libraries/classes/Controllers/Preferences/SqlController.php M libraries/classes/Setup/FormProcessing.php M test/classes/Config/FormDisplayTemplateTest.php M test/classes/Config/FormDisplayTest.php M test/classes/Setup/FormProcessingTest.php D templates/config/form_display/fieldset_bottom.twig D templates/config/form_display/fieldset_top.twig D templates/config/form_display/form_bottom.twig D templates/config/form_display/form_top.twig D templates/config/form_display/tabs_bottom.twig D templates/config/form_display/tabs_top.twig D templates/javascript/display.twig Log Message: ----------- Merge FormDisplay::getDisplay templates Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>