Merge branch 'jointablemodel' of https://github.com/janmeier/sequelize into janmeier-jointablemodel
Conflicts: lib/associations/has-many.js
Showing
with
277 additions
and
38 deletions
-
Please register or sign in to post a comment
不要怂,就是干,撸起袖子干!
Conflicts: lib/associations/has-many.js