Merge pull request #5284 from schnittstabil/master

Stefan Giehl · Stefan Giehl · commit 60831e80b45d · 2014-10-30T14:45:01.000+01:00
Remove composer.json from gitignore.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea/*
 vendor/*
-composer*
+composer.lock
+composer.phar
