Merge pull request #1148 from willkoua/develop

Merge branch 'develop' of https://github.com/MaisonLogicielLibre/Webs…
MaisonLogicielLibre · May 16, 2016 · c245c4f · c245c4f
2 parents 64d9b83 + 01b7afb
commit c245c4f
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 0 deletions.
diff --git a/webroot/img/carousel/1-mobile.jpg b/webroot/img/carousel/1-mobile.jpg
diff --git a/webroot/img/carousel/1.jpg b/webroot/img/carousel/1.jpg
diff --git a/webroot/img/carousel/1trimmed.jpg b/webroot/img/carousel/1trimmed.jpg
diff --git a/webroot/img/carousel/3.jpg b/webroot/img/carousel/3.jpg
diff --git a/webroot/img/carousel/4.jpg b/webroot/img/carousel/4.jpg
diff --git a/webroot/img/carousel/5.png b/webroot/img/carousel/5.png
diff --git a/webroot/img/carousel/6.jpg b/webroot/img/carousel/6.jpg
diff --git a/webroot/img/carousel/ml2-cropped.jpg b/webroot/img/carousel/ml2-cropped.jpg