Merge remote-tracking branch 'origin/feat/teacher-invitation' into feat/teacher-invitation
# Conflicts: # backend/tests/controllers/teacher-invitations.test.ts
This commit is contained in:
		
						commit
						9017b75ce1
					
				
					 8 changed files with 45 additions and 48 deletions
				
			
		|  | @ -1,5 +1,5 @@ | |||
| import { UserDTO } from './user'; | ||||
| import {ClassStatus} from "../util/class-join-request"; | ||||
| import { ClassStatus } from '../util/class-join-request'; | ||||
| 
 | ||||
| export interface TeacherInvitationDTO { | ||||
|     sender: string | UserDTO; | ||||
|  |  | |||
		Reference in a new issue
	
	 Gabriellvl
						Gabriellvl