Commit Graph

5 Commits

Author SHA1 Message Date
Lionarius
baecc03d28 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/bot/commands/lobby.rs
#	src/mixer/mixer.rs
#	src/mixer/role.rs
2023-04-05 11:26:46 +03:00
Lionarius
1ece1cd042 what the hell, now i can mix stuff, and it seems to work 2023-04-05 11:25:49 +03:00
Suiranoil
89cc771834 i question my life decisions 2023-04-04 15:51:21 +03:00
Lionarius
6ceddceca4 cringe? 2023-04-04 07:19:43 +03:00
Lionarius
8fccaa81ca initial commit 2023-04-01 01:53:57 +03:00