Merge branch 'master' into strings

This commit is contained in:
dkanada 2020-08-19 02:06:42 +09:00 committed by GitHub
commit 2c916eb98e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 152 additions and 70 deletions

View file

@ -8,7 +8,7 @@ import appRouter from 'appRouter';
import appHost from 'apphost';
import playbackManager from 'playbackManager';
import syncPlayManager from 'syncPlayManager';
import groupSelectionMenu from 'groupSelectionMenu';
import * as groupSelectionMenu from 'groupSelectionMenu';
import browser from 'browser';
import globalize from 'globalize';
import imageHelper from 'scripts/imagehelper';