Skip to content

Conversation

topi314
Copy link
Member

@topi314 topi314 commented Jul 31, 2021

No description provided.

@topi314 topi314 changed the base branch from master to development July 31, 2021 15:12
@topi314
Copy link
Member Author

topi314 commented Aug 10, 2021

# Conflicts:
#	api/command.go
#	api/entity_builder.go
#	api/message.go
#	core/events/application_command_events.go
#	core/events/command_events.go
#	core/events/component_events.go
#	core/events/generic_interaction_events.go
#	core/events/interaction_events.go
#	core/generic_command_interaction.go
#	core/generic_context_interaction.go
#	core/message_context_interaction.go
#	core/message_create_builder.go
#	core/slash_command_interaction.go
#	core/user_context_interaction.go
#	gateway/handlers/message_create_handler.go
#	gateway/handlers/message_update_handler.go
#	internal/entity_builder_impl.go
#	internal/handlers/interaction_create_handler.go
#	rest/services_impl.go
@topi314 topi314 changed the base branch from development to patch/package-reformat August 10, 2021 16:51
# Conflicts:
#	core/command.go
#	core/entities/invite.go
#	core/entities/role.go
#	gateway/handlers/voice_state_update_handler.go
#	rest/services.go
@topi314 topi314 marked this pull request as ready for review August 14, 2021 09:38
@topi314 topi314 merged commit d6d87e7 into patch/package-reformat Aug 14, 2021
@topi314 topi314 deleted the feature/context-menus branch August 14, 2021 09:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

1 participant