Merge branch 'test-branch' of https://github.com/RitaBot-Project/Rita… · ulou/RitaBot@7e383d0 · GitHub

Commit

Merge branch 'test-branch' of https://github.com/RitaBot-Project/RitaBot

Browse files

 into RitaBot

# Conflicts:
#	package-lock.json
#	package.json

Signed-off-by: Rita <dev@ritabot.gg>

Loading branch information

RitaBot-Dev committed May 23, 2021

1 parent 5190dfc commit 7e383d0