diff options
author | David Baker <dave@matrix.org> | 2016-06-24 14:03:39 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-06-24 14:03:39 +0100 |
commit | 3f7652c56fd925cfa7cbae059993f0dc8f1fabbe (patch) | |
tree | 357433ee4991cb9e040011f5533694ae7a1ed9a8 /.gitignore | |
parent | Remove room name & alias test (diff) | |
parent | Merge pull request #895 from matrix-org/markjh/jenkins_port_range (diff) | |
download | synapse-3f7652c56fd925cfa7cbae059993f0dc8f1fabbe.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/push_room_naming
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions