summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-24 14:03:39 +0100
committerDavid Baker <dave@matrix.org>2016-06-24 14:03:39 +0100
commit3f7652c56fd925cfa7cbae059993f0dc8f1fabbe (patch)
tree357433ee4991cb9e040011f5533694ae7a1ed9a8 /synapse/app
parentRemove room name & alias test (diff)
parentMerge pull request #895 from matrix-org/markjh/jenkins_port_range (diff)
downloadsynapse-3f7652c56fd925cfa7cbae059993f0dc8f1fabbe.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/push_room_naming
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions