Merge remote-tracking branch 'upstream/master' into merge_7_25

This commit is contained in:
Ryan Cavanaugh
2016-07-27 10:57:46 -07:00
312 changed files with 30700 additions and 5251 deletions

2
select2/index.d.ts vendored
View File

@@ -78,7 +78,7 @@ interface Select2Options {
*/
templateSelection?: (object: Select2SelectionObject) => any;
templateResult?: (object: Select2SelectionObject) => any;
language?: string;
language?: string | string[] | {};
}
interface Select2JQueryEventObject extends JQueryEventObject {