Merge branch 'develop' into travis/granular-settings
This commit is contained in:
commit
c5c346f0b7
28 changed files with 2124 additions and 235 deletions
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue