summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-13 14:23:48 +0100
committerErik Johnston <erik@matrix.org>2016-10-14 10:22:43 +0100
commit6f7540ada44b26d6eced6788650a08df672d0610 (patch)
tree37fbc9d465a630ec2ac244d8860b35bbfcbd697d /LICENSE
parentFix email push notifs being dropped (diff)
parentMerge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete (diff)
downloadsynapse-6f7540ada44b26d6eced6788650a08df672d0610.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions