Commits

Andrew Simon authored 18530e2a5ad
DEV-18523: Fix merge conflict

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut