]> git.p6c8.net - policy-templates.git/commitdiff
Merge branch 'master' into 1433870_EnableTrackingProtection
authorMichael Kaply <consulting@kaply.com>
Fri, 23 Mar 2018 19:34:40 +0000 (14:34 -0500)
committerMichael Kaply <consulting@kaply.com>
Fri, 23 Mar 2018 19:34:40 +0000 (14:34 -0500)
1  2 
README.md
windows/en-US/firefox.adml
windows/firefox.admx

diff --cc README.md
Simple merge
Simple merge
Simple merge

patrick-canterino.de