diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-27 17:05:48 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-27 17:05:48 +0100 |
commit | 7c89d5e97ad5f7e8c67622243cc97392c4ab743d (patch) | |
tree | 7769fc5fa3e13b6bf1af556ba02e50d94bb51d46 /webclient/settings | |
parent | Comments! (diff) | |
parent | improve iOS layout a bit (diff) | |
download | synapse-7c89d5e97ad5f7e8c67622243cc97392c4ab743d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'webclient/settings')
-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(); |