summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-10 17:06:53 +0000
committerErik Johnston <erik@matrix.org>2016-02-10 17:06:53 +0000
commit7718303e71d6e8acc59df300d31d31c0cc058868 (patch)
treea5d06450202f759b4a04aa702e710ed620c5dd9c /synapse/storage/appservice.py
parentUpdate CHANGES (diff)
parent0.13.1 (diff)
downloadsynapse-7718303e71d6e8acc59df300d31d31c0cc058868.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage/appservice.py')
0 files changed, 0 insertions, 0 deletions