svlandeg bf819ba302 Merge remote-tracking branch 'upstream/develop' into whatif/arrow ... # Conflicts: # spacy/cli/train.py # spacy/gold.pyx # spacy/ml/models/multi_task.py # spacy/ml/models/simple_ner.py # spacy/ml/models/textcat.py # spacy/ml/models/tok2vec.py # spacy/pipeline/pipes.pyx # spacy/pipeline/simple_ner.py # spacy/scorer.py # spacy/tests/parser/test_add_label.py # spacy/tests/parser/test_nn_beam.py # spacy/tests/pipeline/test_morphologizer.py # spacy/tests/test_scorer.py # spacy/tests/test_util.py # spacy/util.py		2020-06-22 15:15:20 +02:00
..
__init__.py	Tidy up and auto-format	2020-06-20 14:15:04 +02:00
entity_linker.py	Various fixes to NEL functionality, Example class etc (#5460)	2020-05-20 11:41:12 +02:00
multi_task.py	small fixes	2020-06-22 10:05:12 +02:00
parser.py	Format	2020-06-22 01:11:43 +02:00
simple_ner.py	Format	2020-06-22 01:11:43 +02:00
tagger.py	Tidy up and auto-format	2020-06-20 14:15:04 +02:00
textcat.py	Merge remote-tracking branch 'upstream/develop' into whatif/arrow	2020-06-22 15:15:20 +02:00
tok2vec.py	small fixes	2020-06-22 10:05:12 +02:00