Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
matrix-media-repo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
matrix-media-repo
Commits
37dba8d5
Commit
37dba8d5
authored
5 years ago
by
Andrew Morgan
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into anoa/go_mods
parents
2737351b
71c3af9e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
common/config/config.go
+11
-1
11 additions, 1 deletion
common/config/config.go
config.sample.yaml
+10
-0
10 additions, 0 deletions
config.sample.yaml
matrix/federation.go
+24
-11
24 additions, 11 deletions
matrix/federation.go
storage/storage.go
+7
-2
7 additions, 2 deletions
storage/storage.go
with
52 additions
and
14 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
