firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2014-03-14 17:36:09 +09:00
parent ba5426cad5 3c3bfc2b8f
commit 5bb5ff396c
38 changed files with 1123 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
head.sub.php
View File

@ -48,7 +48,7 @@ if($config['cf_add_meta'])
<title><?php echo $g5_head_title; ?></title>
<?php
if (defined('G5_IS_ADMIN')) {
echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/admin.css">'.PHP_EOL;
echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css">'.PHP_EOL;
} else {
$shop_css = '';
if (defined('_SHOP_')) $shop_css = '_shop';