Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

matrix-media-repo
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

6ddbaecd

Commit 6ddbaecd authored 3 years ago by mattc

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into add-users-usage-stats-endpoint

parents 7913c7f9 10444645

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 2 additions, 0 deletions

CHANGELOG.md
assets/providers.json 512 additions, 442 deletions

assets/providers.json
cmd/export_synapse_for_import/main.go 6 additions, 1 deletion

cmd/export_synapse_for_import/main.go
cmd/gdpr_export/main.go 7 additions, 2 deletions

cmd/gdpr_export/main.go
cmd/gdpr_import/main.go 7 additions, 2 deletions

cmd/gdpr_import/main.go
cmd/import_synapse/main.go 6 additions, 1 deletion

cmd/import_synapse/main.go
cmd/media_repo/main.go 6 additions, 1 deletion

cmd/media_repo/main.go
common/config/conf_main.go 1 addition, 0 deletions

common/config/conf_main.go
common/config/models_main.go 1 addition, 0 deletions

common/config/models_main.go
common/logging/logger.go 10 additions, 1 deletion

common/logging/logger.go
config.sample.yaml 5 additions, 0 deletions

config.sample.yaml
matrix/federation.go 4 additions, 0 deletions

matrix/federation.go

with 567 additions and 450 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