Skip to content
Snippets Groups Projects
Commit 73828824 authored by Jake Taylor's avatar Jake Taylor :lips:
Browse files

Merge branch 'release' into 'hotfix/AdjustableFollowerInterval'

# Conflicts:
#   fileTransfer/groupChat/utils_test.go
parents 13021fe9 5417f1aa
Branches
Tags
2 merge requests!510Release,!485early attempt at making the network follower period adjustable via the bindings
Showing
with 265 additions and 120 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment