Merge branch 'master' of https://git.code.sf.net/p/decentralized-internet/git
Fixed package.json dependency issue
Fixed dumb merge conflict
Merge branch 'master' of ssh://git.code.sf.net/p/decentralized-internet/git
Add new files
fixed files
Added files
Changes