Merge remote-tracking branch 'upstream/master' into issue_106

gitlost · gitlost · commit e92d9bc78459 · 2017-07-24T20:21:41.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 vendor
 .*.swp
+composer.lock

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .idea
 vendor
 .*.swp
 +composer.lock