Merge pull request #33 from PublicHealthEngland/development

Multiple updates No conflict.
UKHSA-Internal · Apr 17, 2020 · c66d1fe · c66d1fe
2 parents df5d61b + 5c689a0
commit c66d1fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ This document contains the protocol and workflow for contributions to the **Coro
 ## Repository
 The GitHub repository consists of 2 primary branches:
 - The `master` branch
-- The `development` branch
+- The `development` branch [Default branch]
 
 ### Master branch
 The `master` branch is the base - anything that is committed to the `master` branch is considered final, and are deployed 

diff --git a/public/web.config b/public/web.config
@@ -13,6 +13,10 @@
         </rules>
     </rewrite>
     <staticContent>
+        <remove fileExtension=".woff" />
+        <mimeMap fileExtension=".woff" mimeType="font/woff" />
+        <remove fileExtension=".woff2" />
+        <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
         <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="366.00:00:00" />
     </staticContent>
 </system.webServer>