Merge d8fccef into 2c24885

ARCANESOFT · Oct 16, 2019 · 299101d · 299101d
2 parents 2c24885 + d8fccef
commit 299101d
Show file tree

Hide file tree

Showing 517 changed files with 27,644 additions and 4,208 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitattributes b/.gitattributes
@@ -1,9 +1,13 @@
-/_docs             export-ignore
-/tests             export-ignore
-/.editorconfig     export-ignore
-/.gitattributes    export-ignore
-/.gitignore        export-ignore
-/.scrutinizer.yml  export-ignore
-/.travis.yml       export-ignore
-/CONTRIBUTING.md   export-ignore
-/phpunit.xml.dist  export-ignore
+* text=auto
+
+/.github          export-ignore
+/_docs            export-ignore
+/tests            export-ignore
+.editorconfig     export-ignore
+.gitattributes    export-ignore
+.gitignore        export-ignore
+.scrutinizer.yml  export-ignore
+.travis.yml       export-ignore
+phpcs.xml.dist    export-ignore
+phpunit.xml.dist  export-ignore
+CONTRIBUTING.md   export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 /build/
 /vendor/
-/composer.lock
 /composer.phar
+/composer.lock
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
diff --git a/assets/.gitignore b/assets/.gitignore
@@ -0,0 +1,3 @@
+/node_modules
+npm-debug.log
+yarn-error.log