Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IWB-4: User is navigated off of chooseTeam once they're accepted through waitlist #312

Merged
merged 119 commits into from
Aug 15, 2024

Conversation

FrankreedX
Copy link
Contributor

No description provided.

…eed/foreignManagement3_waitlist_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
…foreignManagement1_blacklist_hook

# Conflicts:
#	app/segments/(team)/chooseTeam.js
…eed/foreignManagement3_waitlist_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
…ed/foreignManagement4_overhaul_auth_redirects

# Conflicts:
#	dbOperations/hooks/useUserInfo.js
…eed/foreignManagement3_waitlist_tab

# Conflicts:
#	app/segments/(team)/chooseTeam.js
…ed/foreignManagement4_overhaul_auth_redirects
…ed/foreignManagement4_overhaul_auth_redirects
…ed/foreignManagement4_overhaul_auth_redirects
…eignManagement1_blacklist_hook

# Conflicts:
#	context/Auth.js
…ed/foreignManagement4_overhaul_auth_redirects

# Conflicts:
#	dbOperations/hooks/useUserInfo.js
# Conflicts:
#	app/segments/(team)/chooseTeam.js
#	app/segments/(team)/manageForeignRequests.js
…ed/foreignManagement4_overhaul_auth_redirects
Base automatically changed from frankreed/foreignManagement3_waitlist_tab to main August 15, 2024 13:04
…edirects

# Conflicts:
#	app/segments/(team)/chooseTeam.js
@FrankreedX FrankreedX merged commit 65b8beb into main Aug 15, 2024
1 check passed
@FrankreedX FrankreedX deleted the frankreed/foreignManagement4_overhaul_auth_redirects branch August 15, 2024 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants