Skip to content
Snippets Groups Projects
Commit 78c5b444 authored by zhengbo's avatar zhengbo
Browse files

Merge remote-tracking branch 'origin/sprint_2' into login_cookie 

# Conflicts:
#	FrontendFolder/switch-room/src/components/AppHeader.vue
#	FrontendFolder/switch-room/src/components/MainPage.vue
parents d6c4052e a7fe2c17
No related branches found
No related tags found
3 merge requests!34Sprint 2 done,!311. add vuex,!29now server can create login cookie and client can store cookie in broser. We use userId as token for login cookie for convinence for now.
Hide whitespace changes
Inline Side-by-side
Showing
with 403 additions and 350 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment