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

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

Conflicts:
	resources/frontend_client/app/card/card.controllers.js
parents 320b3d76 942b2a19
No related branches found
No related tags found
No related merge requests found
Showing
with 342 additions and 118 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