Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
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
Container Registry
Model registry
Operate
Environments
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
Commits
9f633bc1
Commit
9f633bc1
authored
10 years ago
by
Erik Johnston
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of github.com:matrix-org/synapse into develop
Conflicts: CHANGES.rst
parents
3b38d2f5
0d5c7718
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGES.rst
+11
-10
11 additions, 10 deletions
CHANGES.rst
VERSION
+1
-1
1 addition, 1 deletion
VERSION
synapse/__init__.py
+1
-1
1 addition, 1 deletion
synapse/__init__.py
synctl
+3
-3
3 additions, 3 deletions
synctl
with
16 additions
and
15 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
