Merge branch 'main' into gavinmn/attachment

ashygee · web-flow · commit 997e5e65e6f7 · 2022-07-27T12:29:37.000-04:00
diff --git a/.changeset/brave-pumas-vanish.md b/.changeset/brave-pumas-vanish.md
@@ -0,0 +1,5 @@
+---
+"@primer/octicons": minor
+---
+
+Add `cache` 16px icon
diff --git a/.changeset/mean-shoes-divide.md b/.changeset/mean-shoes-divide.md
@@ -0,0 +1,5 @@
+---
+"@primer/octicons": minor
+---
+
+Save git-merge-queue-16.svg
diff --git a/icons/cache-16.svg b/icons/cache-16.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.5 5.724c.241.15.503.286.779.407C4.525 6.68 6.195 7 8 7c1.805 0 3.475-.32 4.722-.869.622-.274 1.172-.62 1.578-1.04.408-.426.7-.965.7-1.591s-.292-1.165-.7-1.59c-.406-.422-.956-.767-1.579-1.041C11.476.32 9.806 0 8 0 6.195 0 4.525.32 3.279.869c-.623.274-1.173.62-1.579 1.04-.408.426-.7.965-.7 1.591v9c0 .626.292 1.165.7 1.59.406.422.956.767 1.579 1.041C4.525 15.68 6.195 16 8 16c.45 0 .89-.02 1.317-.058a.75.75 0 10-.134-1.494c-.381.034-.777.052-1.183.052-1.647 0-3.102-.295-4.117-.742-.51-.224-.874-.47-1.101-.707-.224-.233-.282-.418-.282-.551v-2.276c.164.102.334.196.507.28 1.102.543 2.582.89 4.204.975a.75.75 0 00.078-1.498c-1.476-.077-2.746-.392-3.62-.822C2.738 8.7 2.5 8.248 2.5 8V5.724zm0-2.224c0-.133.058-.318.282-.55.227-.237.592-.484 1.1-.708C4.899 1.795 6.354 1.5 8 1.5c1.647 0 3.102.295 4.117.742.51.224.874.47 1.101.707.224.233.282.418.282.551 0 .133-.058.318-.282.55-.227.237-.592.484-1.1.708C11.101 5.205 9.646 5.5 8 5.5c-1.647 0-3.102-.295-4.117-.742-.51-.224-.874-.47-1.101-.707-.224-.233-.282-.418-.282-.551z"/><path d="M14.49 7.582a.375.375 0 00-.66-.313l-3.625 4.625a.375.375 0 00.295.606h2.127l-.619 2.922a.375.375 0 00.666.304l3.125-4.125A.375.375 0 0015.5 11h-1.778l.769-3.418z"/></svg>
diff --git a/icons/git-merge-queue-16.svg b/icons/git-merge-queue-16.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M3.75 4.5a1.25 1.25 0 100-2.5 1.25 1.25 0 000 2.5z"/><path fill-rule="evenodd" d="M3 7.75a.75.75 0 011.5 0v2.878a2.251 2.251 0 11-1.5 0V7.75zm.75 5.75a.75.75 0 100-1.5.75.75 0 000 1.5z"/><path d="M8.75 5.75a1.25 1.25 0 11-2.5 0 1.25 1.25 0 012.5 0z"/><path fill-rule="evenodd" d="M14.5 8.25a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-1.5 0a.75.75 0 11-1.5 0 .75.75 0 011.5 0z"/></svg>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@primer/octicons": minor
 +---
++
 +Add `cache` 16px icon