Dan Imbrogno 4936f54c11 Merge branch 'types-2.0' into fix-knex-timestamps ... # Conflicts: # knex/index.d.ts		2016-12-13 17:36:51 -05:00
..
index.d.ts	Merge branch 'types-2.0' into fix-knex-timestamps	2016-12-13 17:36:51 -05:00
knex-tests.ts	Merge branch 'types-2.0' into fix-knex-timestamps	2016-12-13 17:36:51 -05:00
tsconfig.json	Fix tsconfig files for new option name / behavior.	2016-07-12 13:54:56 -07:00