Skip to content
Snippets Groups Projects
Verified Commit 4499d67e authored by Ewoud Ruighaver's avatar Ewoud Ruighaver :octopus:
Browse files

Merge branch 'development' into sso

# Conflicts:
#	core/src/main/java/nl/tudelft/ewi/auta/core/Core.java
#	core/src/main/java/nl/tudelft/ewi/auta/core/controller/AssignmentController.java
#	core/src/main/java/nl/tudelft/ewi/auta/core/controller/CourseController.java
#	core/src/main/java/nl/tudelft/ewi/auta/core/controller/SubmissionController.java
#	core/src/main/java/nl/tudelft/ewi/auta/core/response/ErrorCode.java
#	core/src/test/java/nl/tudelft/ewi/auta/core/controller/CourseControllerTest.java
parents 16165d0c 012e2146
Branches
Tags
3 merge requests!148Release 2.3.0,!132Authentication framework refactor,!100Add SAML authentication
Pipeline #220421 failed
Showing
with 717 additions and 111 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment