Sync develop with master #4

Merged
RoshanSyed merged 144 commits from master into develop 2019-12-16 15:20:56 +00:00
2 changed files with 0 additions and 7 deletions
Showing only changes of commit 997d211fb1 - Show all commits

6
.gitmodules vendored
View file

@ -1,9 +1,3 @@
[submodule "vendor/diff-match-patch-cpp-stl"]
path = vendor/diff-match-patch-cpp-stl
url = https://github.com/leutloff/diff-match-patch-cpp-stl
[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/zaphoyd/websocketpp.git

1
vendor/websocketpp vendored

@ -1 +0,0 @@
Subproject commit 378437aecdcb1dfe62096ffd5d944bf1f640ccc3