akashi-esquizolandia/core/include
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
..
advertiser.h Rename lib to core. 2021-04-26 21:14:25 +02:00
aoclient.h Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-01 23:33:00 +02:00
aopacket.h Rename lib to core. 2021-04-26 21:14:25 +02:00
area_data.h Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-01 23:33:00 +02:00
config_manager.h Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-01 23:33:00 +02:00
db_manager.h Rename lib to core. 2021-04-26 21:14:25 +02:00
discord.h Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-01 23:33:00 +02:00
logger.h Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-01 23:33:00 +02:00
server.h Merge remote-tracking branch 'refs/remotes/scatter/master' 2021-05-01 23:33:00 +02:00
ws_client.h Rename lib to core. 2021-04-26 21:14:25 +02:00
ws_proxy.h Rename lib to core. 2021-04-26 21:14:25 +02:00