diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
| commit | 2aeaa7b77c0c39f12c89b0054049970faad28406 (patch) | |
| tree | f3022ab73ea75827dfec17de532fb07b0949196f /webclient/settings/settings-controller.js | |
| parent | Return the store_id from persist_event (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-2aeaa7b77c0c39f12c89b0054049970faad28406.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/handlers/room.py synapse/storage/stream.py
Diffstat (limited to 'webclient/settings/settings-controller.js')
| -rw-r--r-- | webclient/settings/settings-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/settings/settings-controller.js b/webclient/settings/settings-controller.js index 5d3f7cb2b8..f7d5e8eb75 100644 --- a/webclient/settings/settings-controller.js +++ b/webclient/settings/settings-controller.js @@ -16,7 +16,7 @@ limitations under the License. 'use strict'; -angular.module('SettingsController', ['matrixService', 'mFileUpload']) +angular.module('SettingsController', ['matrixService', 'mFileUpload', 'mFileInput']) .controller('SettingsController', ['$scope', 'matrixService', 'mFileUpload', function($scope, matrixService, mFileUpload) { $scope.config = matrixService.config(); |