devel merge

2019-05-05 17:58:27 +09:00
parent 453f5681dd 7d3ec1368f
commit ae02bbcce7
43 changed files with 1714 additions and 107 deletions
@@ -30,9 +30,9 @@ $acl = $session->acl;
        <?=WebUtil::printCSS('../css/entrance.css')?>

        <!-- 액션 -->
-        <?=WebUtil::printJS('../js/common.js')?>
        <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
        <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+        <?=WebUtil::printJS('../js/common.js')?>
        <?=WebUtil::printJS('../js/func.js')?>
        <?=WebUtil::printJS('../js/entrance.js')?>