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

Update develop to match master #844

Merged
merged 2 commits into from
Sep 11, 2021
Merged

Update develop to match master #844

merged 2 commits into from
Sep 11, 2021

Conversation

Thomas-Boi
Copy link
Member

This update develop to matches master

Panquesito7
Panquesito7 approved these changes Sep 10, 2021
View reviewed changes
Copy link
Member

@Panquesito7 Panquesito7 left a comment

Choose a reason for hiding this comment

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

LGTM 🚀 Nice catch, @Thomas-Boi! Thanks. 😄👍

@Panquesito7
Copy link
Member

I tried to update the branch, but this is the error I get:

image

This can be merged only by @amacado or @Thomas-Boi. 🙂

@amacado amacado self-requested a review September 11, 2021 23:12
@amacado amacado merged commit 8d15df7 into develop Sep 11, 2021
@Thomas-Boi Thomas-Boi mentioned this pull request Mar 22, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amacado amacado amacado approved these changes

@Panquesito7 Panquesito7 Panquesito7 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.

None yet
3 participants
@Thomas-Boi @Panquesito7 @amacado