Commit graph

1 commit

Author SHA1 Message Date
AidanTheBandit
b415168ac2 Merge branch 'development' of https://github.com/AidanTheBandit1/Ellie-bot into development
# Conflicts:
#	.idea/compiler.xml
#	.idea/jarRepositories.xml
#	.idea/misc.xml
#	README.md
2022-09-02 23:24:20 -04:00