From: zdover23 <1445107+zdover23@users.noreply.github.com> Date: Thu, 16 Jun 2022 01:50:31 +0000 (+1000) Subject: Merge pull request #46705 from zdover23/wip-doc-2022-06-15--master-to-main-dev-guide... X-Git-Tag: v18.0.0~677 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87e27c89f5a45452f3baefe99a50bba66bdb7da1;p=ceph.git Merge pull request #46705 from zdover23/wip-doc-2022-06-15--master-to-main-dev-guide-merging doc/dev_guide: s/master/main in merging.rst Reviewed-by: Anthony D'Atri --- 87e27c89f5a45452f3baefe99a50bba66bdb7da1