matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge branch 'develop' into bwindels/verification-right-panel

Browse Source
This commit is contained in:
Travis Ralston
2020-01-16 13:23:32 -07:00
parent 7a88a94936 3ed7beac78
commit d1fcef1211
515 changed files with 9064 additions and 7392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/KeyVerificationStateObserver.js
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import MatrixClientPeg from '../MatrixClientPeg';
import {MatrixClientPeg} from '../MatrixClientPeg';
import { _t } from '../languageHandler';
export function getNameForEventRoom(userId, mxEvent) {