Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

831d4797

Commit 831d4797 authored 3 years ago by Andrew Morgan

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 9d21ecf7 6b26536a

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 15 additions, 3 deletions

CHANGES.md
changelog.d/12260.misc 0 additions, 1 deletion

changelog.d/12260.misc
debian/changelog 6 additions, 0 deletions

debian/changelog
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/res/templates/sso_auth_account_details.html 4 additions, 4 deletions

synapse/res/templates/sso_auth_account_details.html
synapse/res/templates/sso_auth_account_details.js 1 addition, 1 deletion

synapse/res/templates/sso_auth_account_details.js
synapse/res/templates/sso_footer.html 1 addition, 1 deletion

synapse/res/templates/sso_footer.html

with 28 additions and 11 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