feat: #1125: Merge master into 1125 & fix conflicts

reapit · May 11, 2020 · d500062 · d500062
2 parents 59d2133 + 0f66915
commit d500062
Show file tree

Hide file tree

Showing 68 changed files with 775 additions and 449 deletions.
diff --git a/packages/aml-checklist/src/tests/badges/badge-branches.svg b/packages/aml-checklist/src/tests/badges/badge-branches.svg
diff --git a/packages/aml-checklist/src/tests/badges/badge-functions.svg b/packages/aml-checklist/src/tests/badges/badge-functions.svg
diff --git a/packages/aml-checklist/src/tests/badges/badge-lines.svg b/packages/aml-checklist/src/tests/badges/badge-lines.svg
diff --git a/packages/aml-checklist/src/tests/badges/badge-statements.svg b/packages/aml-checklist/src/tests/badges/badge-statements.svg
diff --git a/packages/cognito-auth/src/tests/badges/badge-branches.svg b/packages/cognito-auth/src/tests/badges/badge-branches.svg
diff --git a/packages/cognito-auth/src/tests/badges/badge-functions.svg b/packages/cognito-auth/src/tests/badges/badge-functions.svg
diff --git a/packages/cognito-auth/src/tests/badges/badge-lines.svg b/packages/cognito-auth/src/tests/badges/badge-lines.svg
diff --git a/packages/cognito-auth/src/tests/badges/badge-statements.svg b/packages/cognito-auth/src/tests/badges/badge-statements.svg
diff --git a/packages/elements/src/components/HtmlRender/__stubs__/html.ts b/packages/elements/src/components/HtmlRender/__stubs__/html.ts
@@ -24,7 +24,7 @@ export const htmlElements: Element[] = [
       },
       {
         type: 'text',
-        content: ' ...and I liked it. ',
+        content: '...and I liked it. ',
       },
     ],
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ export const htmlElements: Element[] = [ @@
           },
           {
             type: 'text',
-            content: ' ...and I liked it. ',
+            content: '...and I liked it. ',
           },
         ],
       },
@@ Expand Down @@