Ryan Cavanaugh c73630c9a3 Merge commit 'upstream/master~400' into merge_7_25 ...

# Conflicts:
#	angular-translate/angular-translate.d.ts
#	knex/knex.d.ts
#	redux-logger/index.d.ts
#	simplestorage.js/index.d.ts
#	underscore/underscore.d.ts
#	yargs/yargs.d.ts

2016-07-26 13:53:00 -07:00

..

index.d.ts

Merge commit 'upstream/master~400' into merge_7_25

2016-07-26 13:53:00 -07:00

simplestorage.js-tests.ts

Merge commit 'upstream/master~400' into merge_7_25

2016-07-26 13:53:00 -07:00

tsconfig.json

Fix tsconfig files for new option name / behavior.

2016-07-12 13:54:56 -07:00