Skip to content
GitLab
Commit 0688ffa6 authored by Dileep Bapat's avatar Dileep Bapat
Browse files

Merge branch 'open-saber-rc' of github.com:Sunbird-RC/open-saber into open-saber-rc 

# Conflicts:
#	java/registry/src/main/resources/public/_schemas/Student.json
#	java/registry/src/main/resources/public/_schemas/Vehicle.json
parents 3bf8f7ca 72cf61fb
main attestation consent-api create_attach_entity_role_to_user doc immunization internal-entity json-template-type-conv keycloak-updates open-saber-rc open-saber-rc-2 pr-external-context pr-template-url spring-bean-issues sunbirdrc.dev test-fix uat-deploy upsmfac-main v0.0.12 v0.0.13 v0.0.12 v0.0.11 v0.0.10 v0.0.9 v0.0.8 v0.0.7 v0.0.6 v0.0.5 v0.0.4 v0.0.3 v0.0.2 v0.0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 561 additions and 97 deletions
+561 -97
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment