Merge branch 'develop' into next

This commit is contained in:
Kijin Sung 2020-08-29 23:53:31 +09:00
commit ffe9cda5e0
37 changed files with 2047 additions and 1931 deletions

View file

@ -90,7 +90,7 @@ $lang->password = '비밀번호';
$lang->password1 = '새 비밀번호';
$lang->password2 = '새 비밀번호 확인';
$lang->password3 = '비밀번호 확인';
$lang->admin_id = '관리자ID';
$lang->admin_id = '관리자 ID';
$lang->admin_email_address = '관리자 Email 주소';
$lang->writer = '글쓴이';
$lang->user_name = '이름';