Merge master and fix newline conflict.

2020-11-19 17:12:19 -06:00
parent be009f2e54 c1cecb651d
commit cfaa988217
453 changed files with 951 additions and 456 deletions
@@ -87,4 +87,4 @@
 		msg += "<span class='info'>Adminhelps are also sent to Discord. If no admins are available in game adminhelp anyways and an admin on Discord will see it and respond.</span>"
 	to_chat(src, msg)

-*/
+*/