From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Wed, 10 Jul 2019 15:57:22 +0000 (-0500)
Subject: Merge branch 'master' of github.com:mozilla/policy-templates
X-Git-Tag: v1.8~5
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/e64508a9a8e7ca292c0d1a88ac2658fbad5e97be?ds=sidebyside;hp=e64508a9a8e7ca292c0d1a88ac2658fbad5e97be

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