From 82987305ab78d44c013d8edbf7892eb24535d01f Mon Sep 17 00:00:00 2001 From: Eric Mastro Date: Mon, 19 Apr 2021 19:21:00 +1000 Subject: [PATCH] chore: bump dotherside and nimqml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump dotherside to a commit that is on its current master branch. The previous commit and the current commit have the same contents, however the previous commit lived on a branch, and not on the master branch of dotherside. An attempt to bump nimqml to its master branch commit resulted in an error, which has been logged https://github.com/status-im/status-desktop/issues/2275. Instead, the commit change here is the same as dotherside — moving the commit hash from its branched version to the commit that lives on the master branch line. However, as mentioned already, it is not at master HEAD due to the error. --- vendor/DOtherSide | 2 +- vendor/nimqml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/DOtherSide b/vendor/DOtherSide index 5177a129d4..25e70373f8 160000 --- a/vendor/DOtherSide +++ b/vendor/DOtherSide @@ -1 +1 @@ -Subproject commit 5177a129d45985bb61471d7afecd397a82ed9d42 +Subproject commit 25e70373f8558a20132cd3a344c2c2ab5ea041a3 diff --git a/vendor/nimqml b/vendor/nimqml index 29fca3ce2e..6776fed33f 160000 --- a/vendor/nimqml +++ b/vendor/nimqml @@ -1 +1 @@ -Subproject commit 29fca3ce2ed2c9bc0c99163bc2c199b6ed101dd6 +Subproject commit 6776fed33f64e3c2464cef4b9af0f7a868e89257