Daniel Rosenwasser 58345fc448 Merge branch 'master' into handleExtraObjectLiteralProperties ... Conflicts: angular-ui-bootstrap/angular-ui-bootstrap-tests.ts		2015-08-17 12:28:46 -07:00
..
amplifyjs-tests.ts	Add definitions for decoders and ajaxsettings, further defined some instances of "Function" and "any"	2014-06-06 16:08:25 -04:00
amplifyjs-tests.ts.tscparams	Remove quotes from response files	2014-09-02 14:53:39 -07:00
amplifyjs.d.ts	Add 'dataMap' to 'amplifyjs'.	2015-08-10 16:49:00 -07:00