Ines Montani 5651a0d052 💫 Replace {Doc,Span}.merge with Doc.retokenize (#3280) ... * Add deprecation warning to Doc.merge and Span.merge * Replace {Doc,Span}.merge with Doc.retokenize		2019-02-15 10:29:44 +01:00
..
__init__.py	💫 Replace {Doc,Span}.merge with Doc.retokenize (#3280)	2019-02-15 10:29:44 +01:00
render.py	Merge branch 'master' into develop	2019-02-07 20:54:07 +01:00
templates.py	💫 Tidy up and auto-format .py files (#2983)	2018-11-30 17:03:03 +01:00