merge 'feature/live-chat' into dev

COS301-SE-2024 / TuneIn

Introducing TuneIn, where music becomes a shared experience that connects people, transcending distances and creating lasting bonds through the power of music.

7 stars 0 forks source link

merge 'feature/live-chat' into dev #87

Closed lkekana closed 3 months ago

lkekana commented 3 months ago

full backend implementation (tested in Postman & using the 'socket-test.js' script)
full frontend implementation (untested, needs fixing from someone with Android Studio)

lkekana commented 3 months ago

no conflicts on first try😤

Linda-Masia commented 3 months ago

MERGE CONFLICTS!

lkekana commented 3 months ago

ffs these merge conflicts came LOOOOONG after i made the PR

lkekana commented 3 months ago

@Linda-Masia fixed now but i believe Thabiso's still gonna be working in this branch so you can let him merge it

Linda-Masia commented 3 months ago

nice