public / sequelize

Conflicts:
	changelog.md

don't overwrite options.foreignKey in associations

Fixes usage of promise antipatterns in the docs

Fix typo in querying.md

change value from 100 to 1000 to match comment

Return null to tell Bluebird non-return is intentional

…s would not properly use a parent connection

…ning outside of the transaction connection.

[ci skip] Fixed mistype

feat(datatypes) Support fractional DATETIME columns in MySQL 5.6+, fixes #4205

Initial modifications to get enums working with postgres schemas

Fix addAssociations() API docs: null argument does nothing

node-uuid@1.4.4 breaks build 🚨

http://greenkeeper.io/

…ther dialects. Thanks to breakingthings

WIP: Datatypes system refactor