ankitsridhar16
|
863e1ee113
|
fix: fixed merge related conflicting data
|
2023-01-23 15:03:03 +05:30 |
|
ankitsridhar16
|
f7070dd3f7
|
Merge remote-tracking branch 'origin/main' into feat/user-history
# Conflicts:
# packages/hoppscotch-backend/prisma/schema.prisma
# packages/hoppscotch-backend/src/app.module.ts
|
2023-01-23 13:22:12 +05:30 |
|
ankitsridhar16
|
523c650c9d
|
chore: updated primsa type for executed on
|
2023-01-23 13:13:19 +05:30 |
|
ankitsridhar16
|
d066b9c913
|
feat: added prisma schema for user history
|
2022-12-20 14:28:15 +05:30 |
|
ankitsridhar16
|
b4b63f86d9
|
feat: added user environment prisma schema
|
2022-12-13 13:14:13 +05:30 |
|
ankitsridhar16
|
bfc5bfe973
|
chore: added user model in prisma schema
|
2022-12-08 20:26:22 +05:30 |
|
ankitsridhar16
|
333dbba393
|
chore: added docker files for bringing the container up
|
2022-12-06 13:18:02 +05:30 |
|