Skip to content
Snippets Groups Projects
Commit 87eb0c45 authored by uhensler's avatar uhensler
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_14.1'

Conflicts:
	src/main/java/org/olat/course/certificate/restapi/CertificationWebService.java
	src/main/java/org/olat/course/db/restapi/CourseDbWebService.java
	src/main/java/org/olat/course/nodes/co/COWebService.java
	src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java
	src/main/java/org/olat/modules/fo/restapi/ForumCourseNodeWebService.java
	src/main/java/org/olat/modules/fo/restapi/ForumWebService.java
	src/main/java/org/olat/registration/restapi/RegistrationWebService.java
	src/main/java/org/olat/restapi/group/LearningGroupWebService.java
	src/main/java/org/olat/restapi/group/MyGroupWebService.java
parents 68c92733 64c979b8
No related branches found
No related tags found
No related merge requests found
Showing
with 47 additions and 38 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment