g5 merge 충돌수정

2013-10-02 09:13:33 +09:00
parent 21c09985d7 0a1259b3a5
commit 5e05a31146
44 changed files with 811 additions and 551 deletions
--- a/mobile/skin/member/basic/login.skin.php
+++ b/mobile/skin/member/basic/login.skin.php
@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

 <link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">

-<div id="mb_login">
+<div id="mb_login" class="mbskin">
    <h1><?php echo $g5['title'] ?></h1>

    <form name="flogin" action="<?php echo $login_action_url ?>" onsubmit="return flogin_submit(this);" method="post">