brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'custom_grain' into dev_environment

Browse source
This commit is contained in:
csawatzky 2025-12-18 14:42:39 -06:00
commit 709d86eef1
20 changed files with 813 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -10953,11 +10953,7 @@
},
"node_modules/protobuf-ts": {
"version": "1.0.0",
<<<<<<< HEAD
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#80ad2f8b81afe9e04f10f9b52a8250e6824d2b41",
=======
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#c08965a296f2cd0799472fd8b163186cf6885d4c",
>>>>>>> tidio
"resolved": "git+https://gitlab+deploy-token-50627:hv8mB4WkyvtjBpJKU1rN@gitlab.com/brandx/protobuf-ts.git#fa7ac81420665424e5490346c6a6e871480a1643",
"dependencies": {
"protobufjs": "^6.8.8"
}