From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 7 Apr 2020 21:47:23 +0000 (-0500)
Subject: Merge branch 'master' of github.com:mozilla/policy-templates
X-Git-Tag: v1.15~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/5ab121cf293192590e94c5eb367d6e1f59bcf19d?ds=sidebyside;hp=-c

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

5ab121cf293192590e94c5eb367d6e1f59bcf19d