Skip to content
Snippets Groups Projects
Commit 0d143185 authored by Nemanja's avatar Nemanja
Browse files

Merge branch 'master' into branch-ce1e7fed

# Conflicts:
#	enterprise/frontend/test/metabase-enterprise/audit/auditing.cy.spec.js
#	enterprise/frontend/test/metabase-enterprise/sandboxes/sandboxes.cy.spec.js
#	frontend/test/metabase/scenarios/admin/settings/localization.cy.spec.js
#	frontend/test/metabase/scenarios/dashboard/chained-filters.cy.spec.js
#	frontend/test/metabase/scenarios/dashboard/dashboard.cy.spec.js
#	frontend/test/metabase/scenarios/public/public.cy.spec.js
#	frontend/test/metabase/scenarios/question/filter.cy.spec.js
#	frontend/test/metabase/scenarios/question/native.cy.spec.js
#	frontend/test/metabase/scenarios/question/view.cy.spec.js
parents ce1e7fed 2ac6d21f
No related branches found
No related tags found
No related merge requests found
Showing
with 976 additions and 578 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment