Merge remote-tracking branch 'ppu/latest-fc' into bts-updates

This commit is contained in:
Nathan Hourt 2020-12-02 10:16:32 -06:00
commit 74b0201049
No known key found for this signature in database
GPG key ID: B4344309A110851E
2 changed files with 0 additions and 4 deletions

3
.gitmodules vendored
View file

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

1
vendor/websocketpp vendored

@ -1 +0,0 @@
Subproject commit 969c9939112cd9f8a99e9d051cadc406ee634140