diff --git a/dockers/paheko/Dockerfile b/dockers/paheko/Dockerfile index 47a2eb7..f93e97a 100644 --- a/dockers/paheko/Dockerfile +++ b/dockers/paheko/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM paheko/paheko:1.3.18-php8.4 +======= +FROM paheko/paheko:1.3.18-PHP8.4 +>>>>>>> 71aa2dc (paheko 1.3.18 php8.4 et factu 0.16) ENV PAHEKO_DIR /var/www/paheko diff --git a/dockers/paheko/config/facturation.zip b/dockers/paheko/config/facturation.zip index 3c51ee9..b81f95d 100644 Binary files a/dockers/paheko/config/facturation.zip and b/dockers/paheko/config/facturation.zip differ diff --git a/dockers/paheko/config/facturation.zip.old b/dockers/paheko/config/facturation.zip.old new file mode 100644 index 0000000..3c51ee9 Binary files /dev/null and b/dockers/paheko/config/facturation.zip.old differ