Skip to content
Snippets Groups Projects
Commit fbb1f639 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:
	frontend/src/dashboard/actions.js
	frontend/src/visualizations/lib/CardRenderer.js
parents dc6e4a15 6de891bf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 237 additions and 204 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment