Jan Klimke e431ed9c19 Merge branch 'master' of github.com:DefinitelyTyped/DefinitelyTyped ... # Conflicts: # types/sequelize/v3/index.d.ts		2017-07-06 16:55:12 +02:00
..
v3	Merge branch 'master' of github.com:DefinitelyTyped/DefinitelyTyped	2017-07-06 16:55:12 +02:00
index.d.ts	undo spacing change	2017-06-13 14:24:28 -04:00
sequelize-tests.ts	sequelize: update BelongsToMany<Set|Create|Add>AssociationMixin to accept join table attributes (#17071)	2017-06-08 15:27:57 -07:00
tsconfig.json