a653d9607f
# Conflicts: # front/public/static/config/basicConfig.js |
||
---|---|---|
back | ||
front | ||
node_modules | ||
.gitignore | ||
README.md | ||
package.json |
a653d9607f
# Conflicts: # front/public/static/config/basicConfig.js |
||
---|---|---|
back | ||
front | ||
node_modules | ||
.gitignore | ||
README.md | ||
package.json |