unscrew merge

This commit is contained in:
Michael Telatynski 2017-05-05 20:57:18 +01:00 committed by GitHub
parent 110ca22c4c
commit b944fff5c5

View file

@ -24,6 +24,7 @@ const dis = require("../../dispatcher");
const q = require('q');
const packageJson = require('../../../package.json');
const UserSettingsStore = require('../../UserSettingsStore');
const CallMediaHandler = require('../../CallMediaHandler');
const GeminiScrollbar = require('react-gemini-scrollbar');
const Email = require('../../email');
const AddThreepid = require('../../AddThreepid');