Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_repl_servlet
Showing
- .github/ISSUE_TEMPLATE.md 3 additions, 2 deletions.github/ISSUE_TEMPLATE.md
- AUTHORS.rst 4 additions, 1 deletionAUTHORS.rst
- CHANGES.md 9 additions, 0 deletionsCHANGES.md
- CONTRIBUTING.rst 1 addition, 1 deletionCONTRIBUTING.rst
- Dockerfile 19 additions, 3 deletionsDockerfile
- changelog.d/2952.bugfix 1 addition, 0 deletionschangelog.d/2952.bugfix
- changelog.d/3384.misc 1 addition, 0 deletionschangelog.d/3384.misc
- changelog.d/3543.misc 1 addition, 0 deletionschangelog.d/3543.misc
- changelog.d/3569.bugfix 1 addition, 0 deletionschangelog.d/3569.bugfix
- changelog.d/3612.misc 1 addition, 0 deletionschangelog.d/3612.misc
- changelog.d/3621.misc 1 addition, 0 deletionschangelog.d/3621.misc
- changelog.d/3628.misc 1 addition, 0 deletionschangelog.d/3628.misc
- changelog.d/3630.feature 1 addition, 0 deletionschangelog.d/3630.feature
- changelog.d/3634.misc 1 addition, 0 deletionschangelog.d/3634.misc
- changelog.d/3638.misc 1 addition, 0 deletionschangelog.d/3638.misc
- changelog.d/3639.feature 1 addition, 0 deletionschangelog.d/3639.feature
- changelog.d/3645.misc 1 addition, 0 deletionschangelog.d/3645.misc
- contrib/docker/README.md 1 addition, 7 deletionscontrib/docker/README.md
- contrib/docker/docker-compose.yml 1 addition, 0 deletionscontrib/docker/docker-compose.yml
- contrib/grafana/README.md 6 additions, 0 deletionscontrib/grafana/README.md
Loading
Please register or sign in to comment