Skip to content
Snippets Groups Projects
Select Git revision
  • main default protected
  • sprint_3
  • agree_bug_fix
  • agreement_next
  • comment_feature
  • dev_chou
  • agreement
  • https_change
  • sprint_2
  • footer_style
  • FlightTicket
  • notification_bilibili
  • notification_new
  • matching_service
  • login_cookie
  • notification
  • style
  • sprint_1
  • LoginPage
  • sprint_1_offer_wishlist_page
20 results
Blame Permalink
  • fz2907's avatar
    fea24896
    Merge remote-tracking branch 'origin/notification_new' into sprint_2 · fea24896
    fz2907 authored 
    # Conflicts:
#	BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/MatchedWishlistRecordRepository.java
#	FrontendFolder/switch-room/src/App.vue
#	FrontendFolder/switch-room/src/components/AppHeader.vue
#	FrontendFolder/switch-room/src/components/WishlistPage.vue
#	FrontendFolder/switch-room/src/router/index.ts
    fea24896
    History
    Merge remote-tracking branch 'origin/notification_new' into sprint_2
    fz2907 authored 
    # Conflicts:
#	BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/MatchedWishlistRecordRepository.java
#	FrontendFolder/switch-room/src/App.vue
#	FrontendFolder/switch-room/src/components/AppHeader.vue
#	FrontendFolder/switch-room/src/components/WishlistPage.vue
#	FrontendFolder/switch-room/src/router/index.ts