Merge branch 'grad-release' of https://github.com/bcgov/EDUC-GRAD-DIS… · bcgov/EDUC-GRAD-DISTRIBUTION-API@06ced75 · GitHub

Commit

Merge branch 'grad-release' of https://github.com/bcgov/EDUC-GRAD-DIS…

Browse files

…TRIBUTION-API into develop/alex

# Conflicts:
#	api/src/main/java/ca/bc/gov/educ/api/distribution/process/YearEndMergeProcess.java

Loading branch information

arybakov-cgi committed Jul 27, 2023

2 parents 1406d19 + 30bb25d commit 06ced75