cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-13503

Browse Source
This commit is contained in:
Nadyr
2022-08-28 18:06:43 -04:00
committed by GitHub
parent 93870dd2e2 fa6bdf9209
commit 19d875c734
108 changed files with 15379 additions and 242025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/admin/topic.dm
View File

@@ -24,11 +24,8 @@
else if(href_list["ahelp_tickets"])
GLOB.ahelp_tickets.BrowseTickets(text2num(href_list["ahelp_tickets"]))
<<<<<<< HEAD
=======
mentor_commands(href, href_list, src)
>>>>>>> 16eeda039c... Merge pull request #13503 from lm40/master
if(href_list["dbsearchckey"] || href_list["dbsearchadmin"])
var/adminckey = href_list["dbsearchadmin"]