Merge branch 'master' of https://github.com/nurdism/neko into sk_lang

2020-07-11 23:18:28 +02:00
parent c146534ae1 395e23a155
commit bac0686f20
30 changed files with 2684 additions and 1007 deletions
--- a/client/src/locale/en-us.ts
+++ b/client/src/locale/en-us.ts
@ -60,6 +60,7 @@ export const setting = {
  autoplay: 'Autoplay Video',
  ignore_emotes: 'Ignore Emotes',
  chat_sound: 'Play Chat Sound',
+  keyboard_layout: 'Change Keyboard Layout',
 }

 export const connection = {