Fixing merge conflicts with upstream

This commit is contained in:
Chris Troutner
2022-07-08 08:46:05 -07:00
24 changed files with 8669 additions and 11156 deletions
+3 -1
View File
@@ -89,5 +89,7 @@ module.exports = {
ipfsHost: process.env.IPFS_HOST ? process.env.IPFS_HOST : 'localhost',
ipfsApiPort: process.env.IPFS_API_PORT
? parseInt(process.env.IPFS_API_PORT)
: 5001
: 5001,
chatPubSubChan: 'psf-ipfs-chat-001'
}