Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

7c60201d

Commit 7c60201d authored 2 years ago by Benjamin Wenger

Downloads
- Plain Diff

Merge branch 'release' into 'project/Channels'

# Conflicts:
#   README.md
#   groupChat/send.go

parents 71939d9a 305d4fa4

No related branches found

No related tags found

2 merge requests!510Release,!340Project/channels

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

README.md 94 additions, 1 deletion

README.md
backup/backup.go 1 addition, 0 deletions

backup/backup.go
backup/backupRestore.go 1 addition, 0 deletions

backup/backupRestore.go
bindings/fileTransfer.go 2 additions, 1 deletion

bindings/fileTransfer.go
bindings/group.go 3 additions, 2 deletions

bindings/group.go
bindings/ud.go 27 additions, 58 deletions

bindings/ud.go
fileTransfer/manager.go 3 additions, 3 deletions

fileTransfer/manager.go
fileTransfer/send.go 29 additions, 1 deletion

fileTransfer/send.go
groupChat/send.go 39 additions, 52 deletions

groupChat/send.go
groupChat/send_test.go 4 additions, 28 deletions

groupChat/send_test.go
stoppable/multi.go 4 additions, 4 deletions

stoppable/multi.go
stoppable/single.go 4 additions, 0 deletions

stoppable/single.go
ud/lookup.go 0 additions, 24 deletions

ud/lookup.go
ud/manager.go 3 additions, 14 deletions

ud/manager.go

with 214 additions and 188 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment