Merge branch 'develop' into main

ruchengtang · Jun 6, 2021 · 625937f · 625937f
2 parents d975598 + fe171a0
commit 625937f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ composer.phar
 
 # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+composer.lock