search

UOA-CS732-SE750-Students-2024 / project-group-golden-giraffes

Blurple Canvas, but on the web!
https://canvas.projectblurple.com
Other
1 stars 1 forks source link

chore: merge main ← prod #237

Open sou323 opened 2 months ago

sou323 commented 2 months ago

This branch contains commits made post-submission, which are not reflected in the demo deployment but are on the public deployment. This branch will be merged once demos and marking are complete and the main branch is unlocked.

(Don't squash this branch!)

pumbas600 commented 1 month ago

As a note, can we not squash this commit, and instead do a merge commit as each of these branches have already been squashed and I'd like to keep these in the main branch :)