svlandeg 422df9c2e2 Merge remote-tracking branch 'upstream/develop' into feature/docs-layers ... # Conflicts: # website/docs/usage/layers-architectures.md		2020-09-02 13:17:11 +02:00
..
api	Merge pull request #6003 from explosion/feature/matcher-as-spans	2020-08-31 17:50:56 +02:00
images	Add diff example to docs [ci skip]	2020-08-26 15:57:54 +02:00
models	Update docs [ci skip]	2020-08-11 20:57:23 +02:00
usage	Merge remote-tracking branch 'upstream/develop' into feature/docs-layers	2020-09-02 13:17:11 +02:00
index.md	💫 Update website (#3285)	2019-02-17 19:31:19 +01:00
styleguide.md	💫 v2.1.0 launch updates (only merge on launch!) (#3414)	2019-03-18 16:07:26 +01:00