Merge branch 'develop' into travis/granular-settings

2017-11-13 12:18:41 -07:00
parent 030633fa90 4b206a0117
commit c5c346f0b7
28 changed files with 2124 additions and 235 deletions
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -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();