Merge branch 'develop' into tadzik/media-proxy

matrix-org · Aug 28, 2024 · 9f5daf0 · 9f5daf0
2 parents ad63db4 + bd06139
commit 9f5daf0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 20
 
       # We want to install matrix-appservice-bridge, which we depend on.
       - run: yarn --ignore-scripts

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+2.0.1 (2024-07-04)
+==================
+
+### Internal Changes
+
+- Move to ESM for widgets. ([\#1800](https://github.com/matrix-org/matrix-appservice-irc/issues/1800))
+- Improve e2e test reliability. ([\#1803](https://github.com/matrix-org/matrix-appservice-irc/issues/1803))
+- Don't use origin_server_ts when tracking joins, use bridge-time instead. ([\#1804](https://github.com/matrix-org/matrix-appservice-irc/issues/1804))
+
+
 2.0.0 (2024-04-08)
 ==================
 

diff --git a/changelog.d/1800.misc b/changelog.d/1800.misc
diff --git a/changelog.d/1803.misc b/changelog.d/1803.misc
diff --git a/changelog.d/1804.misc b/changelog.d/1804.misc
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "An IRC Bridge for Matrix",
   "main": "app.js",
   "bin": "./bin/matrix-appservice-irc",