Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

3d1cdda7

Commit 3d1cdda7 authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into erikj/reactor_metrics

parents a6c27de1 7eb4d626

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

setup.cfg 3 additions, 0 deletions

setup.cfg
synapse/http/matrixfederationclient.py 0 additions, 1 deletion

synapse/http/matrixfederationclient.py

with 3 additions and 1 deletion

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