Merge branch 'itemskin'

Conflicts: adm/shop_admin/orderlist.php
2013-09-12 11:27:20 +09:00
parent 5b622a1e32 9177db0a34
commit 0cfc29896f
19 changed files with 662 additions and 680 deletions
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@ -1,5 +1,5 @@
 <?php
-if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

 if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;