Merge branch 'master' into 'Login-and-User-Data'
# Conflicts: # prisma/schema.prisma
Showing
- prisma/migrations/20231121035607_added_tables/migration.sql 147 additions, 0 deletionsprisma/migrations/20231121035607_added_tables/migration.sql
- prisma/migrations/migration_lock.toml 3 additions, 0 deletionsprisma/migrations/migration_lock.toml
- prisma/schema.prisma 94 additions, 6 deletionsprisma/schema.prisma
prisma/migrations/migration_lock.toml
0 → 100644
Please register or sign in to comment