Merge branch 'main' into main

primer · Mar 1, 2023 · 302dc8c · 302dc8c
2 parents 586b0c9 + 66486e0
commit 302dc8c
Show file tree

Hide file tree

Showing 33 changed files with 513 additions and 550 deletions.
diff --git a/.changeset/empty-rivers-bathe.md b/.changeset/empty-rivers-bathe.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 17.12.0
+
+### Minor Changes
+
+- [#904](https://github.com/primer/octicons/pull/904) [`ad0eb569`](https://github.com/primer/octicons/commit/ad0eb5699661138ee04baf8938fbb6f291f9f060) Thanks [@CameronFoxly](https://github.com/CameronFoxly)! - Edit: Upload and download icons
+  Add: Move to start, end, top, and bottom icons
+
+* [#918](https://github.com/primer/octicons/pull/918) [`082f722d`](https://github.com/primer/octicons/commit/082f722d1b49ce148830f0e396a5f0933afaaf2a) Thanks [@gavinmn](https://github.com/gavinmn)! - Add 24pt merge queue icon
+
+- [#919](https://github.com/primer/octicons/pull/919) [`bbff0d13`](https://github.com/primer/octicons/commit/bbff0d13c08a0cebafed32d7787ae216c9b26778) Thanks [@CameronFoxly](https://github.com/CameronFoxly)! - Save zoom-in-24.svg, zoom-out-24.svg, zoom-out-16.svg, zoom-in-16.svg
+
 ## 17.11.1
 
 ### Patch Changes

diff --git a/docs/content/packages/index.mdx b/docs/content/packages/index.mdx
diff --git a/docs/content/packages/javascript.mdx b/docs/content/packages/javascript.mdx
diff --git a/docs/content/packages/jekyll.mdx b/docs/content/packages/jekyll.mdx
diff --git a/docs/content/packages/react.mdx b/docs/content/packages/react.mdx