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-3: added waitlist functionality #311

Merged
merged 96 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
…eed/foreignManagement3_waitlist_tab

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

# Conflicts:
#	context/Auth.js
Base automatically changed from frankreed/foreignManagement2_blacklist_tab to main August 15, 2024 13:00
# Conflicts:
#	app/segments/(team)/chooseTeam.js
#	app/segments/(team)/manageForeignRequests.js
@FrankreedX FrankreedX merged commit ad07383 into main Aug 15, 2024
1 check passed
@FrankreedX FrankreedX deleted the frankreed/foreignManagement3_waitlist_tab branch August 15, 2024 13:04
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