language_ja.js
3.95 KB
-
Merge branch 'release_sp3' into 'origin/develop_collaborationUI' · c8260271
# Conflicts: # public/css/chat.css # public/index.html # public/js/language_en.js # public/js/language_ja.js # public/js/language_ko.js
Takatoshi Miura committed