Pour tout problème contactez-nous par mail : support@froggit.fr | La FAQ :grey_question: | Rejoignez-nous sur le Chat :speech_balloon:

Skip to content
Snippets Groups Projects
Commit e72ae0e3 authored by Pierre Jarriges's avatar Pierre Jarriges
Browse files

Merge branch 'dev' into 'master'

default git conf to froggit

See merge request !2
parents 136f9e4b c096e387
No related branches found
No related tags found
1 merge request!2default git conf to froggit
#!/bin/sh #!/bin/sh
git checkout . git checkout .
git pull origin master git pull froggit master
cd admin-frontend cd admin-frontend
npm install npm install
...@@ -12,4 +12,4 @@ npm install ...@@ -12,4 +12,4 @@ npm install
npm run build npm run build
cd .. cd ..
docker-compose up --build docker compose up --build
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
"build": "node build.js && sass ./src/style.scss ../public/style/style.css", "build": "node build.js && sass ./src/style.scss ../public/style/style.css",
"build-prod": "node build.js prod && sass ./src/style.scss ../public/style/style.css --style=compressed" "build-prod": "node build.js prod && sass ./src/style.scss ../public/style/style.css --style=compressed"
}, },
"repository": "https://gitlab.com/peter_rabbit/kuadrado-website", "repository": "https://lab.frogg.it/kuadrado-software/kuadrado-website",
"author": "Kuadrado", "author": "Kuadrado",
"license": "MIT", "license": "MIT",
"homepage": "https://gitlab.com/peter_rabbit/kuadrado-website#readme", "homepage": "https://lab.frogg.it/kuadrado-software/kuadrado-website#readme",
"dependencies": { "dependencies": {
"ks-cheap-translator": "^0.1.0", "ks-cheap-translator": "^0.1.0",
"mentalo-engine": "^0.2.4", "mentalo-engine": "^0.2.4",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment