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
..
ner_example_data
textcat_example_data
conllu-config.json
conllu.py
create_kb.py	small fixes	2020-06-22 10:05:12 +02:00
ner_multitask_objective.py
rehearsal.py
train_entity_linker.py
train_intent_parser.py	Merge branch 'develop' into master-tmp	2020-06-20 15:52:00 +02:00
train_morphologizer.py
train_ner.py
train_new_entity_type.py
train_parser.py
train_tagger.py
train_textcat_config.cfg
train_textcat.py
training-data.json
vocab-data.jsonl