summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-14 10:26:56 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-14 10:26:56 +0000
commita65a5ea1250ade55eed97ded803e864b45c42a6d (patch)
tree9a195e73bdf184d39e42cc44a8b03c1cd29d9a25 /.gitignore
parentlint (diff)
parentMerge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff)
downloadsynapse-a65a5ea1250ade55eed97ded803e864b45c42a6d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account_data_sync
* 'develop' of github.com:matrix-org/synapse:
  Blacklist PurgeRoomTestCase (#6361)
  Set room version default to 5
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions