Parce que Git...

Merge branch 'master' of gitlab.crans.org:meuh/mini-projet_ii

.gitlab-ci.yml

@@ -5,6 +5,7 @@ pages:
     - master
   script:
     - pip install mkdocs-material
+    - cd documentation
     - mkdocs build --site-dir public
   artifacts:
     paths:

documentation/mkdocs.yml

-site_name: Documentation du mini-projet d'Informatique Industrielle d'Etienne
+site_name: Doc_II_Etienne
 nav :
   - Home : index.md
 theme: readthedocs
+<<<<<<< HEAD
 site_url: https://gitlab.crans.org/meuh/mini-projet_ii/documentation
+=======
+site_url: https://perso.crans.org/meuh/Travail/InfoIndus/
+>>>>>>> d8b235decab6b3d1f26681dd2a785d6ac7b676ff
 site_dir: public