Merge branch 'develop' of https://github.com/havfo/multiparty-meeting into develop

2019-02-15 12:24:43 +01:00
parent 7ab0826ad1 3b31c3c3ec
commit 34b295cc81
10 changed files with 16 additions and 15 deletions
@@ -15,7 +15,7 @@ import {
 	turnServers,
 	requestTimeout,
 	transportOptions
-} from '../config';
+} from '../config/config';

 const logger = new Logger('RoomClient');

@@ -12,7 +12,7 @@ import RoomContext from './RoomContext';
 import * as cookiesManager from './cookiesManager';
 import * as stateActions from './redux/stateActions';
 import Room from './components/Room';
-import { loginEnabled } from '../config';
+import { loginEnabled } from '../config/config';
 import { store } from './store';

 const logger = new Logger();