svlandeg 35dbc63578 Merge remote-tracking branch 'upstream/develop' into fix/nr_features ... # Conflicts: # spacy/ml/models/parser.py # spacy/tests/serialize/test_serialize_config.py # website/docs/api/architectures.md		2020-09-23 17:01:13 +02:00
..
api	'parser' instead of 'deps' for state_type	2020-09-23 16:53:49 +02:00
images	Update docs [ci skip]	2020-09-13 22:30:33 +02:00
models	"model" terminology consistency in docs	2020-09-03 13:13:03 +02:00
usage	Merge remote-tracking branch 'upstream/develop' into fix/nr_features	2020-09-23 17:01:13 +02:00
index.md	💫 Update website (#3285)	2019-02-17 19:31:19 +01:00
styleguide.md	Update styleguide [ci skip]	2020-09-14 11:25:57 +02:00