Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

523d5bcd

Commit 523d5bcd authored 8 years ago by Mark Haines

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler

parents f68eea80 43e1e048

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

res/templates/mail.css 5 additions, 0 deletions

res/templates/mail.css
res/templates/notif_mail.html 11 additions, 0 deletions

res/templates/notif_mail.html
synapse/app/synctl.py 4 additions, 0 deletions

synapse/app/synctl.py
synapse/handlers/room_member.py 0 additions, 15 deletions

synapse/handlers/room_member.py
synapse/push/emailpusher.py 24 additions, 8 deletions

synapse/push/emailpusher.py
synapse/push/mailer.py 6 additions, 1 deletion

synapse/push/mailer.py
synapse/push/pusher.py 11 additions, 1 deletion

synapse/push/pusher.py

with 61 additions and 25 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