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

…

amplifyjs-tests.ts.tscparams

…

amplifyjs.d.ts

Add 'dataMap' to 'amplifyjs'.

2015-08-10 16:49:00 -07:00