Merge branch '3.0-dev'

joomla-x · Aug 20, 2017 · 22aa76b · 22aa76b
2 parents cf07458 + 70e32ea
commit 22aa76b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 36 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,5 +6,6 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
+/.composer.lock export-ignore
 /phpunit.xml.dist export-ignore
 /README.md export-ignore
diff --git a/composer.json b/composer.json
@@ -5,6 +5,11 @@
     "keywords": ["joomla", "framework", "dependency injection", "di", "ioc", "container"],
     "homepage": "https://github.com/joomla-x/di",
     "license": "GPL-2.0+",
+    "config": {
+        "preferred-install": {
+            "*": "dist"
+        }
+    },
     "require": {
         "php": "~7.0",
         "psr/container": "~1.0"

diff --git a/composer.lock b/composer.lock