Merge branch 'develop' into travis/granular-settings

This commit is contained in:
Travis Ralston 2017-11-13 12:18:41 -07:00
commit c5c346f0b7
28 changed files with 2124 additions and 235 deletions

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();