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

Various Floof Folder Additions, Merge Conflict Prevention #99

Merged
merged 12 commits into from
Aug 12, 2024

Conversation

ShatteredSwords
Copy link
Contributor

Description

Moved all Floof exclusive items and loadouts to Floof Folder. This will not have a CL because it does not affect what players see, only makes Trystan's job easier.


@github-actions github-actions bot added Changes: YML Changes any yml files Status: Needs Review Someone please review this labels Aug 10, 2024
@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Aug 10, 2024
@Fansana Fansana merged commit 4643c44 into Fansana:master Aug 12, 2024
13 of 14 checks passed
@ShatteredSwords ShatteredSwords deleted the loadouts-to-floof-folder branch August 12, 2024 06:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants