Merge branch 'master' of http://www.github.com/modrinth/labrinth into…

… more-tests
modrinth · Oct 12, 2023 · 3839362 · 3839362
2 parents 9fbcb74 + 07ecd13
commit 3839362
Show file tree

Hide file tree

Showing 54 changed files with 2,945 additions and 2,357 deletions.
diff --git a/.env b/.env
@@ -49,9 +49,9 @@ WHITELISTED_MODPACK_DOMAINS='["cdn.modrinth.com", "github.com", "raw.githubuserc
 
 ALLOWED_CALLBACK_URLS='["localhost", ".modrinth.com", "127.0.0.1"]'
 
-PAYPAL_API_URL=https://api-m.sandbox.paypal.com/v1/
-PAYPAL_CLIENT_ID=none
-PAYPAL_CLIENT_SECRET=none
+TROLLEY_ACCESS_KEY=none
+TROLLEY_SECRET_KEY=none
+TROLLEY_WEBHOOK_SIGNATURE=none
 
 GITHUB_CLIENT_ID=none
 GITHUB_CLIENT_SECRET=none

diff --git a/.idea/labrinth.iml b/.idea/labrinth.iml