From bbe103ca6f6180c15ab4bd3de03a356e2a863082 Mon Sep 17 00:00:00 2001
From: itsjohncs <johnsullivan.pem@gmail.com>
Date: Sun, 17 Apr 2022 17:34:07 -0700
Subject: [PATCH] Pull in SortableJS from NPM again.

SortableJS/Sortable#2095 has been merged so we no longer need to use
our fork.
---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 3438fdc3..91464359 100644
--- a/package.json
+++ b/package.json
@@ -128,6 +128,6 @@
     }
   },
   "resolutions": {
-    "sortablejs": "git+https://github.com/thelounge/Sortable.git"
+    "sortablejs": "1.15.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index fa7d8b14..b9913a30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6530,9 +6530,10 @@ socks@^2.6.1:
     ip "^1.1.5"
     smart-buffer "^4.2.0"
 
-sortablejs@1.10.2, "sortablejs@git+https://github.com/thelounge/Sortable.git":
-  version "1.14.0"
-  resolved "git+https://github.com/thelounge/Sortable.git#9730c70cd48da38d8feb3dd6808b1893157d8dfb"
+sortablejs@1.10.2, sortablejs@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a"
+  integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==
 
 source-map-js@^1.0.2:
   version "1.0.2"