g5 merge 충돌 수정

2013-11-06 10:10:11 +09:00
parent dd69f1723f d0d8e3d2b7
commit fd2179f05b
57 changed files with 3366 additions and 25 deletions
--- a/head.php
+++ b/head.php
@ -110,6 +110,12 @@ if ($config['cf_include_head']) {
                </a>
            </li>
            <?php }  ?>
+            <li>
+                <a href="<?php echo G5_BBS_URL ?>/qalist.php">
+                    <img src="<?php echo G5_IMG_URL ?>/tnb_cnt.jpg" alt="">
+                    1:1문의
+                </a>
+            </li>
            <li>
                <a href="<?php echo G5_BBS_URL ?>/current_connect.php">
                    <img src="<?php echo G5_IMG_URL ?>/tnb_cnt.jpg" alt="">