Merge branch 'release'

* release: chore(release): 2.11.2 chore(ci): fix generation of documentation fix: recover code lost from bad merges fix: remove duplicate config definitions chore(release): 2.11.1 fix: remove duplicate config definitions (#46)
hickey · Mar 2, 2024 · 1cd2f8c · 1cd2f8c
2 parents f3cf9ee + 845c4f1
commit 1cd2f8c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -24,8 +24,8 @@ jobs:
           done
       - name: Update version strings
         run: |
-          find docs -type f --exec sed -i "s/%VERSION%/${{ inputs.build_version }}/" {} \;
-        run: |
+          find docs -type f -exec sed -i "s/%VERSION%/${{ inputs.build_version }}/" {} \;
+      - run: |
           echo ::group::Archive artifact
           tar -C "_site" \
               -cvf "$RUNNER_TEMP/artifact.tar" \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 
 
+## [2.11.2](https://github.com/hickey/meshchat/compare/v2.11.1...v2.11.2) (2024-03-02)
+
+
+### Bug Fixes
+
+* recover code lost from bad merges ([05c8dff](https://github.com/hickey/meshchat/commit/05c8dff7192941651145a4423916de46797adf3e))
+* remove duplicate config definitions ([53dd0c6](https://github.com/hickey/meshchat/commit/53dd0c6785167537430e592e0d6d895499ac3ce7))
+
+## [2.11.1](https://github.com/hickey/meshchat/compare/v2.11.0...v2.11.1) (2024-03-02)
+
+
+### Bug Fixes
+
+* remove duplicate config definitions ([#46](https://github.com/hickey/meshchat/issues/46)) ([a6cb468](https://github.com/hickey/meshchat/commit/a6cb468ca0fa594629a1bae0e22781dfc0bf074e))
+
 ## [2.11.0](https://github.com/hickey/meshchat/compare/v2.10.0...v2.11.0) (2024-03-01)