Merge branch 'master' into fix/better-autoload

xyu · xyu · commit 5f7ead145652 · 2018-02-02T23:14:25.000Z
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+src                 export-ignore
+build.php           export-ignore
+example.php         export-ignore
diff --git a/composer.json b/composer.json
@@ -25,9 +25,6 @@
       "url": "https://github.com/Automattic/php-thrift-sql"
     }
   ],
-  "archive": {
-    "exclude": [ "/src", "/build.php", "/example.php" ]
-  },
   "require-dev": {
     "jesseschalken/autoload-generator": "^0.2.3"
   }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@`
`25`	`25`	`"url": "https://github.com/Automattic/php-thrift-sql"`
`26`	`26`	`}`
`27`	`27`	`],`
`28`		`- "archive": {`
`29`		`- "exclude": [ "/src", "/build.php", "/example.php" ]`
`30`		`- },`
`31`	`28`	`"require-dev": {`
`32`	`29`	`"jesseschalken/autoload-generator": "^0.2.3"`
`33`	`30`	`}`