Cerapter 68b4174a40 Merge remote-tracking branch 'refs/remotes/scatter/master' ... Conflicts: akashi.pro core/include/logger.h core/src/commands/area.cpp core/src/packets.cpp include/logger.h src/commands/area.cpp src/packets.cpp		2021-05-01 23:33:00 +02:00
..
discord.h	Apply some suggested changes	2021-04-29 01:02:47 +02:00