summary refs log tree commit diff
path: root/synapse/push/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:58:54 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:58:54 +0000
commit91015ad008b0d4538022fbddae7da397f7bd7000 (patch)
tree766c9a589fc9f3b8aa7109b43df51a8984bdd1d2 /synapse/push/__init__.py
parentRemember to add schema file to list (diff)
downloadsynapse-91015ad008b0d4538022fbddae7da397f7bd7000.tar.xz
Remove merge conflict
Diffstat (limited to 'synapse/push/__init__.py')
0 files changed, 0 insertions, 0 deletions