Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2

2023-06-30 14:36:47 +02:00
parent fe7c8bf282 cebda53e85
commit 6a47b52c24
8 changed files with 34 additions and 25 deletions
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -14,6 +14,7 @@ fi

 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv

+
 #TODO: use in UpdateController

 get_blob () {   # get the blob of the file(name) passed as $1