merge

.dir-locals.el

resources/frontend_client/app/card/card.controllers.js

...ontend_client/app/query_builder/gui_query_editor.react.js

.../frontend_client/app/query_builder/visualization.react.js

.../query_builder/visualization_object_detail_table.react.js

...end_client/app/query_builder/visualization_table.react.js

src/metabase/driver.clj

src/metabase/driver/query_processor.clj

src/metabase/util.clj

test/metabase/api/card_test.clj

test/metabase/driver/query_processor_test.clj

test/metabase/test_setup.clj