Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801

2017-05-23 15:16:31 +01:00
parent 46bb29a3af
commit d419c42a4f
73 changed files with 4660 additions and 639 deletions
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-var Skinner = require('./Skinner');
+import Skinner from './Skinner';
+import request from 'browser-request';
+import UserSettingsStore from './UserSettingsStore';

 module.exports.loadSkin = function(skinObject) {
    Skinner.load(skinObject);