From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Fri, 17 Apr 2020 18:03:31 +0000 (-0500)
Subject: Merge branch 'master' of github.com:mozilla/policy-templates
X-Git-Tag: v1.16~5
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/9c7ddbf2eab95bf39eb43da21e67b52332b27c41?ds=sidebyside

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

9c7ddbf2eab95bf39eb43da21e67b52332b27c41