Merge branch 'master'

This commit is contained in:
canove
2020-07-08 14:34:44 -03:00

4
backend/.gitignore vendored
View File

@@ -1,4 +1,8 @@
node_modules
<<<<<<< HEAD
/src/public/*
=======
src/public/*
>>>>>>> 855e28c7d73506671ea1a37b162f381b2d9c01b7
!src/public/.gitkeep
.env