-
-
- diff --git a/_content/Thumbs.db b/_content/Thumbs.db new file mode 100644 index 0000000..1ff12f4 Binary files /dev/null and b/_content/Thumbs.db differ diff --git a/home.html b/home.html index 3f16bf4..1234383 100644 --- a/home.html +++ b/home.html @@ -1,21 +1,21 @@ - - - -
-+======= + + +>>>>>>> d120872e658c0bb2df803f19a903096b4a6a7928 diff --git a/mentions-legales.html b/mentions-legales.html index 361f4e6..8683dcb 100644 --- a/mentions-legales.html +++ b/mentions-legales.html @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -24,4 +25,32 @@ +======= + + + +
+ + +
+ + + + +
+ +>>>>>>> d120872e658c0bb2df803f19a903096b4a6a7928