Merge branch 'master' into areesha-display-new

openfoodfacts · Aug 3, 2020 · 4188333 · 4188333
2 parents d6f387b + a735c80
commit 4188333
Show file tree

Hide file tree

Showing 12 changed files with 675 additions and 71 deletions.
diff --git a/.github/workflows/containerimage.yml b/.github/workflows/containerimage.yml
@@ -13,7 +13,7 @@ jobs:
       with:
         fetch-depth: 1
     - name: Publish frontend image to Registry
-      uses: elgohr/Publish-Docker-Github-Action@2.18
+      uses: elgohr/Publish-Docker-Github-Action@2.19
       with:
         name: ${{ github.repository }}/frontend
         username: ${{ github.actor }}
@@ -34,7 +34,7 @@ jobs:
         rm icons.tar js.tar css.tar
         docker rm -v $CONTAINER
     - name: Publish backend image to Registry
-      uses: elgohr/Publish-Docker-Github-Action@2.18
+      uses: elgohr/Publish-Docker-Github-Action@2.19
       with:
         name: ${{ github.repository }}/backend
         username: ${{ github.actor }}

diff --git a/html/images/lang/de/labels/qualitatszeichen-baden-wurttemberg.90x90.jpg b/html/images/lang/de/labels/qualitatszeichen-baden-wurttemberg.90x90.jpg
diff --git a/html/images/lang/en/labels/canada-organic.90x90.svg b/html/images/lang/en/labels/canada-organic.90x90.svg
diff --git a/html/images/lang/en/labels/european-vegetarian-union.90x90.svg b/html/images/lang/en/labels/european-vegetarian-union.90x90.svg
diff --git a/html/images/lang/en/labels/hechsher-safed-rabbinate.90x90.jpg b/html/images/lang/en/labels/hechsher-safed-rabbinate.90x90.jpg
diff --git a/html/images/lang/en/labels/kosher-baint.90x90.svg b/html/images/lang/en/labels/kosher-baint.90x90.svg