Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/9' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
rusher committed Oct 1, 2018
2 parents 667b4a0 + bf1ab8a commit 6d3dd8b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ The Connector remains in development. Here's a list of features being developed
* MariaDB `ed25519` plugin authentication
* Query Timeouts
* Bulk Insertion, (that is, fast batch).
* [Sequelize](https://github.com/sequelize/sequelize) integration


## Contributing
Expand Down

0 comments on commit 6d3dd8b

Please sign in to comment.