language_en.js
3.17 KB
-
Merge branch 'origin/develop_apply_design_chat' into origin/develop_createRoom_UI · 9887029f
# Conflicts: # public/css/chat.css # public/js/chat-db.js # public/js/chat-ui.js # public/js/language_en.js # public/js/language_ja.js # public/js/language_ko.js
Kang Donghun committed