2 Commits

Author	SHA1	Message	Date
Matthew Honnibal	2c4a6d66fa	Merge master into develop. Big merge, many conflicts -- need to review	2018-04-29 14:49:26 +02:00
Matthew Honnibal	1f7229f40f	Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop" ... This reverts commit c9ba3d3c2d, reversing changes made to 92c26a35d4.	2018-03-27 19:23:02 +02:00