Merge branch 'master' of github.com:mozilla-services/autopush-rs into…

… release/1.68.3
mozilla-services · Oct 2, 2023 · 919df7f · 919df7f
2 parents af3422f + 68e447d
commit 919df7f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,8 @@
 *   tag 1.68.1 (#448) ([b55bbe76](https://github.com/mozilla-services/autopush-rs/commit/b55bbe7680be5e0601353321653fbefa9a9e737b))
 
 
+
+>>>>>>> 68e447d2ac0c84550e438f86fa9d0e6fc20350d5
 <a name="1.68.1"></a>
 ## 1.68.1 (2023-09-27)
 

diff --git a/Cargo.lock b/Cargo.lock