Merge remote-tracking branch 'github/feature/sort-favorited-rooms-fir… · Vincit/get-a-room@cb39a0d · GitHub

Commit

Merge remote-tracking branch 'github/feature/sort-favorited-rooms-fir…

Browse files

…st' into feature/sort-favorited-rooms-first

# Conflicts:
#	frontend/src/components/AvailableRoomList/AvailableRoomList.tsx

Loading branch information

villepynttari committed Jul 10, 2024

2 parents 0b26c56 + 6d0684e commit cb39a0d