Merge branch 'master' into develop

govCMS · Mar 2, 2020 · 607d0b7 · 607d0b7
2 parents 8cefec0 + e0c189d
commit 607d0b7
Show file tree

Hide file tree

Showing 16 changed files with 31,695 additions and 4,334 deletions.
diff --git a/...144cc98fb89e1a8f22cee1fbbb1b90ab9aeb.json → ...190ab8540e69e1f469a5840901cc389429d2.json b/...144cc98fb89e1a8f22cee1fbbb1b90ab9aeb.json → ...190ab8540e69e1f469a5840901cc389429d2.json
diff --git a/app/develop/index.html b/app/develop/index.html
diff --git a/app/develop/index.htmlPNnBDk b/app/develop/index.htmlPNnBDk
diff --git a/app/develop/packages.json b/app/develop/packages.json
@@ -1,8 +1,8 @@
 {
     "packages": [],
     "includes": {
-        "include/all$c0d7e5e1c08756720a1fa005ced5f6ecaa1e9c6f.json": {
-            "sha1": "c0d7e5e1c08756720a1fa005ced5f6ecaa1e9c6f"
+        "include/all$6d32190ab8540e69e1f469a5840901cc389429d2.json": {
+            "sha1": "6d32190ab8540e69e1f469a5840901cc389429d2"
         }
     }
 }
diff --git a/...cd79a7903ab24c6c2d341361721187248df5.json → ...5742321277c306b6f6f90d21546b9e01b259.json b/...cd79a7903ab24c6c2d341361721187248df5.json → ...5742321277c306b6f6f90d21546b9e01b259.json
diff --git a/app/index.html b/app/index.html
diff --git a/app/index.htmlEICPoP b/app/index.htmlEICPoP
diff --git a/app/index.htmlGjhaeo b/app/index.htmlGjhaeo
diff --git a/app/index.htmldEnBck b/app/index.htmldEnBck
diff --git a/...e5e1c08756720a1fa005ced5f6ecaa1e9c6f.json → ...35643150d502098f81ab7dbe9616ed9cbc0e.json b/...e5e1c08756720a1fa005ced5f6ecaa1e9c6f.json → ...35643150d502098f81ab7dbe9616ed9cbc0e.json
diff --git a/app/master/index.html b/app/master/index.html
diff --git a/app/master/index.htmloljBIe b/app/master/index.htmloljBIe
diff --git a/app/master/packages.json b/app/master/packages.json
@@ -1,8 +1,8 @@
 {
     "packages": [],
     "includes": {
-        "include/all$df9b144cc98fb89e1a8f22cee1fbbb1b90ab9aeb.json": {
-            "sha1": "df9b144cc98fb89e1a8f22cee1fbbb1b90ab9aeb"
+        "include/all$ee7c35643150d502098f81ab7dbe9616ed9cbc0e.json": {
+            "sha1": "ee7c35643150d502098f81ab7dbe9616ed9cbc0e"
         }
     }
 }
diff --git a/app/packages.json b/app/packages.json
@@ -1,8 +1,8 @@
 {
     "packages": [],
     "includes": {
-        "include/all$36dacd79a7903ab24c6c2d341361721187248df5.json": {
-            "sha1": "36dacd79a7903ab24c6c2d341361721187248df5"
+        "include/all$08495742321277c306b6f6f90d21546b9e01b259.json": {
+            "sha1": "08495742321277c306b6f6f90d21546b9e01b259"
         }
     }
 }
diff --git a/app/whitelist/index.html b/app/whitelist/index.html
@@ -21,8 +21,8 @@
             <a href="https://satis.govcms.gov.au/whitelist">
                 <h1>govcms/satis-whitelist</h1>
             </a>
-            <span class="badge badge-light m-1" title="Friday, 17-Jan-2020 07:15:23 UTC">
-                <img width="135" height="74" style="padding-bottom: 1em;" src="/logo.svg" /><br />Last updated: <br class="d-md-none"> <time datetime="2020-01-17T07:15:23+00:00">Friday, 17 Jan 2020 07:15:23 UTC</time>
+            <span class="badge badge-light m-1" title="Monday, 02-Mar-2020 19:53:58 UTC">
+                <img width="135" height="74" style="padding-bottom: 1em;" src="/logo.svg" /><br />Last updated: <br class="d-md-none"> <time datetime="2020-03-02T19:53:58+00:00">Monday, 02 Mar 2020 19:53:58 UTC</time>
             </span>
         </div>
 

diff --git a/satis-config/govcms-develop.json b/satis-config/govcms-develop.json
@@ -11,10 +11,10 @@
     "require": {
         "govcms/govcms": "1.x-dev",
         "govcms/scaffold-tooling": "dev-develop",
-        "govcms/require-dev": "dev-develop"
+        "govcms/require-dev": "dev-develop",
         "fabpot/goutte": "3.2.3"
     },
     "require-dependencies": true,
     "require-dev-dependencies": true,
-    "only-best-candidates": true,
+    "only-best-candidates": true
 }