Commits

Andrew Simon authored 991b2025216
DEV-16948: Fix merge conf

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

Add shortcut