From: HeiHei90 <h.heinen90@gmail.com>
Date: Mon, 3 Sep 2018 08:21:04 +0000 (+0200)
Subject: Merge branch 'master' of github.com:mozilla/policy-templates into addFeature/AppUpdateURL
X-Git-Tag: v1.2~13^2~3
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/1cb7efbbff64e09c46ad51a3e5efa6b10f9b6688?hp=--cc

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

1cb7efbbff64e09c46ad51a3e5efa6b10f9b6688