Merge remote-tracking branch 'origin/dev' into fix/verschillende-authenticatieproblemen
# Conflicts: # frontend/src/i18n/locale/de.json # frontend/src/i18n/locale/en.json
This commit is contained in:
commit
af0f40f63e
21 changed files with 1006 additions and 492 deletions
|
@ -34,6 +34,6 @@ router.get('/:username/joinRequests/:classId', getStudentJoinRequestHandler);
|
|||
router.put('/:username/joinRequests/:classId/:studentUsername', updateStudentJoinRequestHandler);
|
||||
|
||||
// Invitations to other classes a teacher received
|
||||
router.get('/invitations', invitationRouter);
|
||||
router.use('/invitations', invitationRouter);
|
||||
|
||||
export default router;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue