diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-26 15:33:37 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-26 15:33:37 -0400 |
| commit | 9be7248ba54eeb2ad4d19edd4c01ee736b58bfcd (patch) | |
| tree | 6f66b86bbe9adaffb7d866b22a89e0e3f78f26a3 /src/components/notifications/NotificationPrompts.tsx | |
| parent | 883a6c51d4c3e442df5e6c0f3dc6fada2f370f8e (diff) | |
| parent | 99de9c8402f470ead242a81510dc2764ae7d9e66 (diff) | |
Merge branch 'master' into tma728-select-school-onboarding
# Conflicts:
# src/services/UserProfileService.ts
# src/types/types.ts
Diffstat (limited to 'src/components/notifications/NotificationPrompts.tsx')
0 files changed, 0 insertions, 0 deletions