aboutsummaryrefslogtreecommitdiffstats
path: root/package-lock.json
diff options
context:
space:
mode:
authorLibravatar kytwb <kytwb@pm.me>2021-12-16 13:35:21 +0100
committerLibravatar kytwb <kytwb@pm.me>2021-12-16 13:35:21 +0100
commit13b1c593ecc364ba0db4efc06b33caddb0d0146e (patch)
treeffcc677f0c5c8da80cffd936ece8e018d8597aaf /package-lock.json
parent5.6.4-nightly.35 [skip ci] (diff)
parent5.6.4 (diff)
downloadferdium-app-13b1c593ecc364ba0db4efc06b33caddb0d0146e.tar.gz
ferdium-app-13b1c593ecc364ba0db4efc06b33caddb0d0146e.tar.zst
ferdium-app-13b1c593ecc364ba0db4efc06b33caddb0d0146e.zip
Merge branch 'release' into develop
# Conflicts: # package-lock.json # package.json
Diffstat (limited to 'package-lock.json')
-rw-r--r--package-lock.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/package-lock.json b/package-lock.json
index d6402d47f..71b24946b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
1{ 1{
2 "name": "ferdi", 2 "name": "ferdi",
3 "version": "5.6.4-nightly.35", 3 "version": "5.6.4",
4 "lockfileVersion": 2, 4 "lockfileVersion": 2,
5 "requires": true, 5 "requires": true,
6 "packages": { 6 "packages": {
7 "": { 7 "": {
8 "name": "ferdi", 8 "name": "ferdi",
9 "version": "5.6.4-nightly.35", 9 "version": "5.6.4",
10 "license": "Apache-2.0", 10 "license": "Apache-2.0",
11 "dependencies": { 11 "dependencies": {
12 "@adonisjs/ace": "^5.0.8", 12 "@adonisjs/ace": "^5.0.8",