Merge commit 'upstream/master~200' into merge_7_25

clementdenis · Jul 27, 2016 · c33a46c · c33a46c
2 parents a4f5ae3 + 870472d
commit c33a46c
Show file tree

Hide file tree

Showing 84 changed files with 22,285 additions and 1,133 deletions.
diff --git a/ace/index.d.ts b/ace/index.d.ts
@@ -77,9 +77,6 @@ declare namespace AceAjax {
 
         onTextInput(text: any): void;
     }
-    var KeyBinding: {
-        new(editor: Editor): KeyBinding;
-    }
 
     export interface TextMode {
 

diff --git a/adal/index.d.ts b/adal/index.d.ts
@@ -131,9 +131,9 @@ declare namespace adal {
 
         /**
          * Gets requestInfo from given hash.
-         * @returns {string} error message related to login
+         * @returns {RequestInfo} for appropriate hash.
          */
-        getRequestInfo(hash: string): string;
+        getRequestInfo(hash: string): RequestInfo;
 
         /**
          * Saves token from hash that is received from redirect.