From 9b89c5c80566df9fc93b4cbb4d3c2cb1b5d9eb47 Mon Sep 17 00:00:00 2001 From: Noah Harvey Date: Wed, 22 Nov 2023 17:20:03 -0500 Subject: [PATCH 1/2] updates dcs-branch-merger to 1.4.1 --- package.json | 2 +- public/build_number | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index bc057382..6c99b673 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "axios": "^0.21.0", "bible-reference-range": "^1.1.0", "datatable-translatable": "1.2.3", - "dcs-branch-merger": "^1.3.0", + "dcs-branch-merger": "1.4.1", "deep-freeze": "^0.0.1", "gitea-react-toolkit": "2.2.4", "lodash.isequal": "^4.5.0", diff --git a/public/build_number b/public/build_number index 79ca276e..3d6b7630 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -273-2ccee8b +274-ac6d090 diff --git a/yarn.lock b/yarn.lock index 187dc870..f14b3b8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5749,10 +5749,10 @@ dayjs@^1.9.3: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== -dcs-branch-merger@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/dcs-branch-merger/-/dcs-branch-merger-1.3.0.tgz#0836fa5c6cd37d28fccc8b7fc9569b1ef3eae393" - integrity sha512-MZ8skMj7J96PQiYwu/ILTSE5gItpFvKNFshc/aekkEAMzXeo+ZDbO0v3g05CVQGXLHQ5vQ09igAUIXz36LzsZw== +dcs-branch-merger@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/dcs-branch-merger/-/dcs-branch-merger-1.4.1.tgz#57a2819c8189f8f23325eff8bebf4f7c698b2c49" + integrity sha512-IJbG5OpZQkxNDYao+T5MOrtVatvzDBGsuEwoZ7kq214OCTwlR+J96ApyamNeg+/i5ZQ8oKa3H4OMM6NFp6s7Zw== dependencies: path "0.12.7" From 98b50915566ee2b6270296a5dca10e822026e16c Mon Sep 17 00:00:00 2001 From: Noah Harvey Date: Wed, 22 Nov 2023 17:20:19 -0500 Subject: [PATCH 2/2] bumps package version --- package.json | 2 +- public/build_number | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6c99b673..7e9abdc7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tc-create-app", "homepage": "https://create.translationcore.com/", - "version": "1.16", + "version": "1.17", "license": "MIT", "private": false, "bugs": { diff --git a/public/build_number b/public/build_number index 3d6b7630..9935315f 100644 --- a/public/build_number +++ b/public/build_number @@ -1 +1 @@ -274-ac6d090 +275-9b89c5c