Merge branch 'master' of github.com:mozilla/policy-templates

author Michael Kaply <345868+mkaply@users.noreply.github.com>

Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)

committer Michael Kaply <345868+mkaply@users.noreply.github.com>

Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)
author Michael Kaply <345868+mkaply@users.noreply.github.com>
Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)
committer Michael Kaply <345868+mkaply@users.noreply.github.com>
Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)
diff --cc README.md
Simple merge
diff --cc docs/index.md
Simple merge
diff --cc mac/org.mozilla.firefox.plist
Simple merge
author	Michael Kaply <345868+mkaply@users.noreply.github.com>
	Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)
committer	Michael Kaply <345868+mkaply@users.noreply.github.com>
	Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/index.md	patch \|	diff1 \|	diff2 \|	blob \| history
mac/org.mozilla.firefox.plist	patch \|	diff1 \|	diff2 \|	blob \| history