Merge branch 'g5'

This commit is contained in:
chicpro
2015-12-22 10:07:35 +09:00
169 changed files with 13559 additions and 15563 deletions

View File

@ -63,7 +63,7 @@ define('G5_LGXPAY_DIR', 'lgxpay');
define('G5_SNS_DIR', 'sns');
define('G5_SYNDI_DIR', 'syndi');
define('G5_PHPMAILER_DIR', 'PHPMailer_v2.0.4');
define('G5_PHPMAILER_DIR', 'PHPMailer');
define('G5_SESSION_DIR', 'session');
define('G5_THEME_DIR', 'theme');
@ -165,7 +165,8 @@ define('G5_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|[^A]skt|nokia|blackberry
// SMTP
// lib/mailer.lib.php 에서 사용
define('G5_SMTP', '127.0.0.1');
define('G5_SMTP', '127.0.0.1');
define('G5_SMTP_PORT', '25');
/********************