matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-07 05:22:15 +03:00
Code Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Bruno Windels
2018-10-01 15:40:16 +02:00
parent 9c9d8468a5 550cf00ee7
commit 80c190db36
4 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/client.js
View File

@@ -772,17 +772,6 @@ MatrixClient.prototype.getGroups = function() {
return this.store.getGroups();
};
/**
* Get the config for the media repository.
* @param {module:client.callback} callback Optional.
* @return {module:client.Promise} Resolves with an object containing the config.
*/
MatrixClient.prototype.getMediaConfig = function(callback) {
return this._http.requestWithPrefix(
callback, "GET", "/config", undefined, undefined, httpApi.PREFIX_MEDIA_R0,
);
};
// Room ops
// ========