Merge branch '1.10'

OrchardCMS · Mar 17, 2016 · 6dcbbc2 · 6dcbbc2
2 parents 16031ff + ea45c4f
commit 6dcbbc2
Show file tree

Hide file tree

Showing 5,398 changed files with 453,456 additions and 635,844 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/.gitignore b/.gitignore
@@ -186,5 +186,6 @@ src/Orchard.Web/Properties/PublishProfiles
 src/Orchard.Azure/Orchard.Azure.CloudService/Staging/
 
 #enable all /lib artifacts
-!lib/*/*.*
+!lib/**/*.*
 */.vs/*
+src/Rebracer.xml
diff --git a/.hgeol b/.hgeol
@@ -0,0 +1,2 @@
+[patterns]
+** = native