[MERGING]

PrestaShop · Jan 28, 2016 · 0cce884 · 0cce884
1 parent 6e0a30b
commit 0cce884
Show file tree

Hide file tree

Showing 66 changed files with 16,712 additions and 34 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,4 +3,4 @@ dist/*.css   text eol=lf
 dist/*.js    text eol=lf
 
 # Use your side of the merge.
-dist/* merge=ours
+dist/**/* merge=ours