merge

.dir-locals.el

...metabase/admin/settings/components/SettingsCustomMaps.jsx

...c/metabase/visualizations/components/LegacyChoropleth.jsx

src/metabase/api/geojson.clj

test/metabase/api/activity_test.clj

test/metabase/api/geojson_test.clj

test/metabase/api/session_test.clj

test/metabase/api/table_test.clj

test/metabase/db_test.clj

test/metabase/driver/generic_sql_test.clj

test/metabase/driver/h2_test.clj

test/metabase/driver/postgres_test.clj

test/metabase/middleware_test.clj

test/metabase/models/dashboard_test.clj

test/metabase/models/field_test.clj

test/metabase/models/humanization_test.clj

test/metabase/models/metric_test.clj

test/metabase/models/segment_test.clj

test/metabase/models/session_test.clj

test/metabase/models/setting_test.clj