From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 15 Oct 2021 08:33:35 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.4.1~6^2~2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9e32b402bf75bc332c57a7285ac55426bb20186e;p=pixelpark%2Fpp-admin-tools.git

Merge branch 'master' into develop
---

9e32b402bf75bc332c57a7285ac55426bb20186e
diff --cc .gitignore
index ffc9660,4914459..c643eaa
--- a/.gitignore
+++ b/.gitignore
@@@ -10,5 -10,6 +10,7 @@@ MANIFES
  *.egg-info
  .idea
  *.whl
 -
 +*.retry
 +tmp/*
+ .bundle/
+ vendor/