Regular merge of develop

.ci/deploy.sh

@@ -17,6 +17,11 @@ for branch in $(git for-each-ref --format='%(refname:strip=3)' refs/remotes); do
 
     # build the website
     bundle exec jekyll build --baseurl="howto-cards/$artefact" -d "public/$artefact"
+
+    if [[ $branch == "master" ]]; then
+        # set the 404
+        cp howto-cards/$artefact/404.html public/404.html
+    fi
 done
 
 # checkout the current branch
@@ -26,6 +31,3 @@ git reset --hard origin/$CI_COMMIT_REF_NAME
 
 # set the auto redirection
 cp .ci/.autoRedirect public/index.html
-
-# set the 404
-cp 404.html public/.