Skip to content
Snippets Groups Projects
Commit eaaf714e authored by Tom Robinson's avatar Tom Robinson
Browse files

Merge branch 'master' of github.com:metabase/metabase into... 

Merge branch 'master' of github.com:metabase/metabase into new-dash-plus-scalable-cards-plus-fullscreen

Conflicts:
	src/metabase/db/migrations.clj
parents 7a5cc0d3 769c28c2
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 168 additions and 131 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment