Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +2 -2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d810971c83 - Show all commits

2
.gitmodules vendored
View file

@ -6,7 +6,7 @@
url = https://github.com/bitshares/secp256k1-zkp.git
[submodule "vendor/websocketpp"]
path = vendor/websocketpp
url = https://github.com/zaphoyd/websocketpp.git
url = https://github.com/bitshares/websocketpp.git
[submodule "vendor/editline"]
path = vendor/editline
url = https://github.com/troglobit/editline.git

2
vendor/websocketpp vendored

@ -1 +1 @@
Subproject commit 378437aecdcb1dfe62096ffd5d944bf1f640ccc3
Subproject commit e6c4e3c54bf9cf1892c85a6ed6289486bba36fa1