Merge branch 'release/1.1' into develop

LachlanCourt · Apr 21, 2024 · 1e9243b · 1e9243b
2 parents 35817d1 + 4992ee1
commit 1e9243b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.github/workflows/build-and-push-main.yml b/.github/workflows/build-and-push-main.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - release/1.1
 
 jobs:
   build-and-push:

diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "webapp",
   "description": "Web interface for twitch chatbot",
+  "version": "1.1.0",
   "engines": {
     "node": ">=20.0.0"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - main
+          - release/1.1
     jobs:
       build-and-push:
@@ Expand Down @@