Merge branch 'dev' into feat/assignment-page

Browse source

# Conflicts:
#	backend/package.json
#	common/src/interfaces/assignment.ts
#	frontend/src/controllers/learning-paths.ts
#	frontend/src/i18n/locale/de.json
#	frontend/src/i18n/locale/en.json
#	frontend/src/i18n/locale/fr.json
#	frontend/src/i18n/locale/nl.json
#	frontend/src/views/assignments/CreateAssignment.vue
#	package-lock.json

...

This commit is contained in:

Joyelle Ndagijimana 2025-04-19 16:58:08 +02:00

parent 8f75a862f2 c649fa15c4

commit a421b1996a

123 changed files with 2428 additions and 2658 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1195

package-lock.json generated

View file

File diff suppressed because it is too large Load diff