From: Michael Kaply <consulting@kaply.com>
Date: Fri, 31 Aug 2018 20:52:58 +0000 (-0500)
Subject: Merge branch 'master' of github.com:mozilla/policy-templates
X-Git-Tag: v1.2~15
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/b8b96f32bdd01bfe2de58c58d58a17fd968a2533?ds=sidebyside

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

b8b96f32bdd01bfe2de58c58d58a17fd968a2533