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.

Sign up for GitHub

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

Jump to bottom

Bigorra #47

Merged
merged 8 commits into from
Dec 17, 2023
Merged

Bigorra #47

merged 8 commits into from
Dec 17, 2023

Conversation

fhoudebert
Copy link
Contributor

Add 2 variants : bigorra + fantastic XIII
Add 4 new fairy pieces : griffon, mammoth, troll, hawk

mi-g
mi-g requested changes Dec 16, 2023
View reviewed changes
Copy link
Collaborator

@mi-g mi-g left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you remove the file "basic-model (copie).js" ? this is very probably a file that should not be included

@fhoudebert
Copy link
Contributor Author

basic-model (copie).js is removed

@fhoudebert
Copy link
Contributor Author

fhoudebert commented Dec 17, 2023 via email

@fhoudebert fhoudebert closed this Dec 17, 2023
@fhoudebert fhoudebert reopened this Dec 17, 2023
@fhoudebert
Copy link
Contributor Author

conflicts resolved

@mi-g mi-g merged commit 88ad632 into aclap-dev:master Dec 17, 2023
@fhoudebert fhoudebert deleted the bigorra branch December 17, 2023 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mi-g mi-g mi-g approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fhoudebert @mi-g