Merge remote-tracking branch 'origin/master' · Chalwk77/HALO-SCRIPT-PROJECTS@cc31458 · GitHub

Commit

Merge remote-tracking branch 'origin/master'

Browse files

# Conflicts:
#	INDEV/Admin Manager/about.md
#	INDEV/Admin Manager/commands/login.lua
#	INDEV/Admin Manager/commands/pw_admin_add.lua
#	INDEV/Admin Manager/commands/pw_admin_delete.lua
#	INDEV/Admin Manager/events/on_chat.lua
#	INDEV/Admin Manager/settings.lua

Loading branch information

Chalwk77 committed Jul 20, 2023

2 parents e8436e4 + 72faa33 commit cc31458