Merge pull request #23 from ezsystems/travis_failures

[Travis] Get Travis to run again
ezsystems · Jun 16, 2015 · e3ad87d · e3ad87d
2 parents 34a4429 + 0ba2cba
commit e3ad87d
Show file tree

Hide file tree

Showing 2 changed files with 5,525 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,6 @@
 /web/var
 /web/.htaccess
 composer.phar
-composer.lock
 .buildpath
 .project
 .settings/