[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8d3ea3: Merge options block with display/results/table template