Merge branch 'main' into repo-sync

Octomerger · web-flow · commit 9a37b05f45b9 · 2021-11-16T14:47:28.000-05:00
diff --git a/assets/images/help/organizations/org-settings-moderation-settings.png b/assets/images/help/organizations/org-settings-moderation-settings.png
diff --git a/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md b/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md
@@ -34,7 +34,7 @@ If you selected a specific amount of time to block the user, they will be automa
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-{% data reusables.organizations.block_users %}
+{% data reusables.organizations.moderation-settings %}
 5. Under "Blocked users", next to the user you'd like to unblock, click **Unblock**.
 ![Unblock user button](/assets/images/help/organizations/org-unblock-user-button.png)
 
diff --git a/data/reusables/organizations/moderation-settings.md b/data/reusables/organizations/moderation-settings.md
@@ -0,0 +1,2 @@
+1. In the left sidebar, click **Moderation settings**.
+![Moderation settings in organization's settings](/assets/images/help/organizations/org-settings-moderation-settings.png)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+1. In the left sidebar, click Moderation settings.`
	`2`	`+![Moderation settings in organization's settings](/assets/images/help/organizations/org-settings-moderation-settings.png)`