Merge branch 'master' into develop

author Frank Brehm <frank.brehm@pixelpark.com>

Fri, 15 Oct 2021 08:33:35 +0000 (10:33 +0200)

committer Frank Brehm <frank.brehm@pixelpark.com>

Fri, 15 Oct 2021 08:33:35 +0000 (10:33 +0200)
author Frank Brehm <frank.brehm@pixelpark.com>
Fri, 15 Oct 2021 08:33:35 +0000 (10:33 +0200)
committer Frank Brehm <frank.brehm@pixelpark.com>
Fri, 15 Oct 2021 08:33:35 +0000 (10:33 +0200)
diff --cc .gitignore

index ffc9660c75e26fbdd5d5bc3ce2706b873d631b29,4914459f8fe665c425117d7a48793a65bffbdb1f..c643eaa5b98b60bee202b78c98528b5cd2ad9750
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -10,5 -10,6 +10,7 @@@ MANIFES
   *.egg-info
   .idea
   *.whl
- -
+ +*.retry
+ +tmp/*
+ .bundle/
+ vendor/
author	Frank Brehm <frank.brehm@pixelpark.com>
	Fri, 15 Oct 2021 08:33:35 +0000 (10:33 +0200)
committer	Frank Brehm <frank.brehm@pixelpark.com>
	Fri, 15 Oct 2021 08:33:35 +0000 (10:33 +0200)