merge commit

This commit is contained in:
Daniel Avila 2023-03-17 19:40:44 -04:00
commit 586c162404
25 changed files with 431 additions and 283 deletions

1
.gitignore vendored
View file

@ -34,6 +34,7 @@ client/public/main.js.LICENSE.txt
# Deployed apps should consider commenting these lines out:
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules/
meili_data/
api/node_modules/
client/node_modules/
bower_components/