Merge branch '1.0' into 1.1

* 1.0: Perform only one Composer install on Travis Remove composer.lock
ezecosystem · Mar 12, 2018 · bd2f31d · bd2f31d
2 parents 98ce7d9 + f19cc4c
commit bd2f31d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10,584 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@
 !/bin/validate-package
 !/bin/validate-packages
 
+/composer.lock
 /vendor
 /node_modules