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

Merge branch 'develop' into travis/granular-settings

Browse Source
This commit is contained in:
Travis Ralston
2017-11-13 12:18:41 -07:00
parent 030633fa90 4b206a0117
commit c5c346f0b7
28 changed files with 2124 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/UserSettingsStore.js
View File

@@ -21,7 +21,6 @@ import MatrixClientPeg from './MatrixClientPeg';
/*
* TODO: Make things use this. This is all WIP - see UserSettings.js for usage.
*/
export default {
loadProfileInfo: function() {
const cli = MatrixClientPeg.get();