Merge remote-tracking branch 'origin/feature/embeds' into feature/embeds · Kaktushose/jda-commands@2100eca · GitHub

Commit

Merge remote-tracking branch 'origin/feature/embeds' into feature/embeds

Browse files

# Conflicts:
#	core/src/main/java/com/github/kaktushose/jda/commands/embeds/Embed.java

Loading branch information

Kaktushose committed Feb 28, 2025

2 parents 9c2e617 + 3218252 commit 2100eca