Merge remote-tracking branch 'origin/dev' into feat/pagina-om-leerpaden-te-bekijken-#41
# Conflicts: # frontend/src/App.vue # frontend/src/components/MenuBar.vue # frontend/src/main.ts
This commit is contained in:
		
						commit
						8522cde18d
					
				
					 68 changed files with 868 additions and 896 deletions
				
			
		| 
						 | 
				
			
			@ -39,7 +39,7 @@ export async function getAllLearningObjects(req: Request, res: Response): Promis
 | 
			
		|||
        learningObjects = await learningObjectService.getLearningObjectIdsFromPath(learningPathId);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    res.json(learningObjects);
 | 
			
		||||
    res.json({ learningObjects: learningObjects });
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function getLearningObject(req: Request, res: Response): Promise<void> {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue