Merge pull request #3792 from Luke265/master

Jan Aagaard Meier
2015-07-26T13:37:36+02:00

Bug fix: #3266 - belongsToMany junction table timestamp

Conflicts:
lib/associations/mixin.js