Merge develop to beatrice 2022-04 #660

Merged
serkixenos merged 79 commits from develop into beatrice 2022-04-14 08:38:52 +00:00
3 changed files with 9 additions and 9 deletions
Showing only changes of commit 99119dbd7d - Show all commits

14
.gitmodules vendored
View file

@ -1,9 +1,9 @@
[submodule "docs"]
path = docs
url = https://github.com/bitshares/bitshares-core.wiki.git
ignore = dirty
path = docs
url = https://github.com/bitshares/bitshares-core.wiki.git
ignore = dirty
[submodule "libraries/fc"]
path = libraries/fc
url = https://github.com/peerplays-network/peerplays-fc.git
branch = latest-fc
ignore = dirty
path = libraries/fc
url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git
branch = latest-fc
ignore = dirty

2
docs

@ -1 +1 @@
Subproject commit 8df8f66389853df73ab8f6dd73981be2a6957df8
Subproject commit 1e924950c2f92b166c34ceb294e8b8c4997a6c4e

@ -1 +1 @@
Subproject commit 488883921936139e8734b99822d3a589afe80da1
Subproject commit 86b77c6eb450f97a29c627d3fa9728e25bed933a