From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Thu, 25 Jul 2019 19:08:15 +0000 (-0500)
Subject: Merge branch 'master' of github.com:mozilla/policy-templates
X-Git-Tag: v1.8.1
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/909f651564700d255913d2fd44a9783b638b7887?ds=sidebyside;hp=-c

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

909f651564700d255913d2fd44a9783b638b7887