Merge pull request #3506 from pixelfed/staging

Revert composer.lock removal
3 years ago · 66ab7491a3
parent a87bd46e89 1301ab42c6
commit 66ab7491a3
2 changed files with 11684 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,4 +20,3 @@ yarn-error.log
 .git-credentials
 /.composer/
 /nginx.conf
-composer.lock
--- a/composer.lock
+++ b/composer.lock