Merge branch 'master' of github.com:yiisoft/yii2

.gitattributes

@@ -0,0 +1,23 @@
+# Autodetect text files
+* text=auto
+
+# ...Unless the name matches the following overriding patterns
+
+# Definitively text files
+*.php  text
+*.css  text
+*.js   text
+*.txt  text
+*.md   text
+*.xml  text
+*.json text
+*.bat  text
+*.sql  text
+*.xml  text
+*.yml  text
+
+# Ensure those won't be messed up with
+*.png  binary
+*.jpg  binary
+*.gif  binary
+*.ttf  binary

apps/benchmark/protected/.htaccess

@@ -1 +1 @@
-deny from all
+deny from all

build/.htaccess

@@ -1 +1 @@
-deny from all
+deny from all

framework/yii/.htaccess

@@ -1 +1 @@
-deny from all
+deny from all

framework/yii/web/SpicyRice.md

@@ -1,11 +1,11 @@
-## Spicy Rice font
+## Spicy Rice font
-
+
-* **Author:** Brian J. Bonislawsky, Astigmatic (AOETI, Astigmatic One Eye Typographic Institute)
+* **Author:** Brian J. Bonislawsky, Astigmatic (AOETI, Astigmatic One Eye Typographic Institute)
-* **License:** SIL Open Font License (OFL), version 1.1, [notes and FAQ](http://scripts.sil.org/OFL)
+* **License:** SIL Open Font License (OFL), version 1.1, [notes and FAQ](http://scripts.sil.org/OFL)
-
+
-## Links
+## Links
-
+
-* [Astigmatic](http://www.astigmatic.com/)
+* [Astigmatic](http://www.astigmatic.com/)
-* [Google WebFonts](http://www.google.com/webfonts/specimen/Spicy+Rice)
+* [Google WebFonts](http://www.google.com/webfonts/specimen/Spicy+Rice)
-* [fontsquirrel.com](http://www.fontsquirrel.com/fonts/spicy-rice)
+* [fontsquirrel.com](http://www.fontsquirrel.com/fonts/spicy-rice)
-* [fontspace.com](http://www.fontspace.com/astigmatic-one-eye-typographic-institute/spicy-rice)
+* [fontspace.com](http://www.fontspace.com/astigmatic-one-eye-typographic-institute/spicy-rice)