cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 19:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
Conflicts:
	code/setup.dm
This commit is contained in:
Chinsky
2013-10-08 15:16:57 +04:00
parent 89f7503ce1 3c678d7990
commit 7555dd0f0b
11 changed files with 150 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/permissionverbs/permissionedit.dm
+2 -2
View File
@@ -12,8 +12,8 @@
<html>
<head>
<title>Permissions Panel</title>
<script type='text/javascript' src='html/search.js'></script>
<link rel='stylesheet' type='text/css' href='html/panels.css'>
<script type='text/javascript' src='search.js'></script>
<link rel='stylesheet' type='text/css' href='panels.css'>
</head>
<body onload='selectTextField();updateSearch();'>
<div id='main'><table id='searchable' cellspacing='0'>